From f54b892ebcd608daf26263f399c81fb251586384 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 3 Apr 2018 14:28:28 +0000 Subject: [PATCH] Refactored utils to match newer branches. --- .../dist/game/GameServer_loop.sh | 2 +- .../ai/group_template/AltarsOfSacrifice.java | 2 +- .../data/scripts/ai/individual/DrChaos.java | 2 +- .../ai/individual/ScarletVanHalisha.java | 2 +- .../ai/npc/ForgeOfTheGods/TarBeetleSpawn.java | 4 +- .../ai/npc/NevitsHerald/NevitsHerald.java | 2 +- .../ai/npc/NpcBuffers/NpcBuffersData.java | 2 +- .../custom/listeners/ListenerTest.java | 2 +- .../HallOfErosionAttack.java | 2 +- .../HallOfErosionDefence.java | 2 +- .../HeartInfinityAttack.java | 2 +- .../HeartInfinityDefence.java | 2 +- .../SeedOfDestruction/SeedOfDestruction.java | 2 +- .../handlers/actionhandlers/L2NpcAction.java | 2 +- .../AdminEventEngine.java | 2 +- .../admincommandhandlers/AdminZones.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../handlers/effecthandlers/Fishing.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/RunAway.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 2 +- .../scripts/hellbound/HellboundPointData.java | 2 +- .../scripts/hellbound/HellboundSpawns.java | 2 +- .../FinalEmperialTomb/FinalEmperialTomb.java | 2 +- .../Q00025_HidingBehindTheTruth.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q00356_DigUpTheSeaOfSpores.java | 2 +- .../Q00426_QuestForFishingShot.java | 2 +- .../Q00662_AGameOfCards.java | 2 +- .../Q00697_DefendTheHallOfErosion.java | 2 +- .../Q00698_BlockTheLordsEscape.java | 2 +- .../Q00708_PathToBecomingALordGludio.java | 2 +- .../Q00709_PathToBecomingALordDion.java | 2 +- .../dist/game/startGameServer.bat | 4 +- .../java/com/l2jmobius/Config.java | 4 +- .../commons/database/DatabaseFactory.java | 2 +- .../network/BaseRecievePacket.java | 2 +- .../network/BaseSendablePacket.java | 2 +- .../util/CommonUtil.java} | 13 ++---- .../{ => commons}/util/DeadLockDetector.java | 2 +- .../{ => commons}/util/EmptyQueue.java | 2 +- .../{ => commons}/util/EnumIntBitmask.java | 2 +- .../{ => commons}/util/HexUtils.java | 17 +++++-- .../{ => commons}/util/IPSubnet.java | 46 +++++++++++-------- .../data/xml => commons/util}/IXmlReader.java | 4 +- .../{ => commons}/util/PrimeFinder.java | 2 +- .../{ => commons}/util/PropertiesParser.java | 2 +- .../com/l2jmobius/{ => commons}/util/Rnd.java | 18 ++++---- .../util/crypt/BlowfishEngine.java | 2 +- .../{ => commons}/util/crypt/LoginCrypt.java | 4 +- .../{ => commons}/util/crypt/NewCrypt.java | 2 +- .../util/crypt/ScrambledKeyPair.java | 2 +- .../util/file/filter/ExtFilter.java | 2 +- .../util/file/filter/HTMLFilter.java | 2 +- .../util/file/filter/NumericNameFilter.java | 2 +- .../util/file/filter/SQLFilter.java | 2 +- .../util/file/filter/XMLFilter.java | 2 +- .../com/l2jmobius/gameserver/GameServer.java | 4 +- .../gameserver/LoginServerThread.java | 12 ++--- .../com/l2jmobius/gameserver/MonsterRace.java | 2 +- .../gameserver/RecipeController.java | 2 +- .../gameserver/SevenSignsFestival.java | 2 +- .../gameserver/ai/L2AttackableAI.java | 2 +- .../gameserver/ai/L2CharacterAI.java | 2 +- .../gameserver/ai/L2ControllableMobAI.java | 2 +- .../gameserver/ai/L2FortSiegeGuardAI.java | 2 +- .../gameserver/ai/L2SiegeGuardAI.java | 2 +- .../l2jmobius/gameserver/ai/L2SummonAI.java | 2 +- .../l2jmobius/gameserver/cache/HtmCache.java | 2 +- .../gameserver/data/sql/impl/ClanTable.java | 2 +- .../gameserver/data/xml/impl/AdminData.java | 2 +- .../data/xml/impl/ArmorSetsData.java | 2 +- .../gameserver/data/xml/impl/BuyListData.java | 4 +- .../data/xml/impl/CategoryData.java | 2 +- .../data/xml/impl/ClassListData.java | 2 +- .../gameserver/data/xml/impl/DoorData.java | 2 +- .../data/xml/impl/EnchantItemData.java | 2 +- .../data/xml/impl/EnchantItemGroupsData.java | 2 +- .../data/xml/impl/EnchantItemHPBonusData.java | 2 +- .../data/xml/impl/EnchantItemOptionsData.java | 2 +- .../data/xml/impl/EnchantSkillGroupsData.java | 2 +- .../data/xml/impl/ExperienceData.java | 2 +- .../gameserver/data/xml/impl/FishData.java | 2 +- .../data/xml/impl/FishingMonstersData.java | 2 +- .../data/xml/impl/FishingRodsData.java | 2 +- .../gameserver/data/xml/impl/HennaData.java | 2 +- .../data/xml/impl/HitConditionBonusData.java | 2 +- .../data/xml/impl/InitialEquipmentData.java | 2 +- .../data/xml/impl/InitialShortcutData.java | 2 +- .../data/xml/impl/ItemMallData.java | 2 +- .../gameserver/data/xml/impl/KarmaData.java | 2 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 2 +- .../gameserver/data/xml/impl/OptionData.java | 2 +- .../data/xml/impl/PetDataTable.java | 2 +- .../data/xml/impl/PetSkillData.java | 2 +- .../data/xml/impl/PlayerTemplateData.java | 2 +- .../xml/impl/PlayerXpPercentLostData.java | 2 +- .../gameserver/data/xml/impl/RecipeData.java | 2 +- .../data/xml/impl/SecondaryAuthData.java | 2 +- .../data/xml/impl/SiegeScheduleData.java | 2 +- .../data/xml/impl/SkillLearnData.java | 2 +- .../data/xml/impl/SkillTreesData.java | 2 +- .../data/xml/impl/StaticObjectData.java | 2 +- .../data/xml/impl/TransformData.java | 2 +- .../gameserver/data/xml/impl/UIData.java | 2 +- .../datatables/AugmentationData.java | 2 +- .../datatables/NpcPersonalAIData.java | 2 +- .../gameserver/datatables/SpawnTable.java | 2 +- .../gameserver/engines/DocumentEngine.java | 2 +- .../gameserver/idfactory/BitSetIDFactory.java | 2 +- .../instancemanager/CastleManorManager.java | 4 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/DuelManager.java | 2 +- .../FishingChampionshipManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../instancemanager/MapRegionManager.java | 2 +- .../instancemanager/QuestManager.java | 6 +-- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../instancemanager/SiegeManager.java | 2 +- .../instancemanager/SoIManager.java | 2 +- .../instancemanager/TerritoryWarManager.java | 2 +- .../instancemanager/WalkingManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../gameserver/model/AbstractPlayerGroup.java | 2 +- .../gameserver/model/AutoSpawnHandler.java | 2 +- .../gameserver/model/CursedWeapon.java | 2 +- .../gameserver/model/DimensionalRiftRoom.java | 2 +- .../l2jmobius/gameserver/model/L2Clan.java | 2 +- .../gameserver/model/L2GroupSpawn.java | 2 +- .../gameserver/model/L2MapRegion.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 2 +- .../l2jmobius/gameserver/model/L2Spawn.java | 2 +- .../gameserver/model/L2Territory.java | 2 +- .../l2jmobius/gameserver/model/MobGroup.java | 2 +- .../l2jmobius/gameserver/model/WalkInfo.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 2 +- .../gameserver/model/actor/L2Character.java | 4 +- .../gameserver/model/actor/L2Npc.java | 2 +- .../gameserver/model/actor/L2Summon.java | 2 +- .../actor/instance/L2BabyPetInstance.java | 2 +- .../model/actor/instance/L2BlockInstance.java | 2 +- .../model/actor/instance/L2CubicInstance.java | 2 +- .../model/actor/instance/L2DoorInstance.java | 2 +- .../actor/instance/L2GrandBossInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2PcInstance.java | 4 +- .../model/actor/instance/L2PetInstance.java | 2 +- .../actor/instance/L2RaidBossInstance.java | 2 +- .../instance/L2SepulcherNpcInstance.java | 2 +- .../actor/instance/L2TamedBeastInstance.java | 2 +- .../model/actor/status/CharStatus.java | 2 +- .../model/actor/status/PcStatus.java | 2 +- .../model/actor/tasks/cubics/CubicAction.java | 2 +- .../tasks/player/LookingForFishTask.java | 2 +- .../model/actor/templates/L2NpcTemplate.java | 2 +- .../model/actor/templates/L2PcTemplate.java | 2 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/entity/BlockCheckerEngine.java | 2 +- .../model/entity/DimensionalRift.java | 2 +- .../gameserver/model/entity/Duel.java | 2 +- .../gameserver/model/entity/Message.java | 2 +- .../gameserver/model/entity/TvTEvent.java | 2 +- .../model/entity/TvTEventTeleporter.java | 2 +- .../model/events/AbstractScript.java | 8 ++-- .../model/events/ListenersContainer.java | 2 +- .../gameserver/model/fishing/L2Fishing.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/Inventory.java | 4 +- .../model/items/enchant/EnchantScroll.java | 2 +- .../model/olympiad/OlympiadGameClassed.java | 2 +- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../model/olympiad/OlympiadGameTeams.java | 2 +- .../gameserver/model/quest/Quest.java | 6 +-- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../gameserver/model/zone/L2ZoneRespawn.java | 2 +- .../model/zone/form/ZoneCuboid.java | 2 +- .../model/zone/form/ZoneCylinder.java | 2 +- .../gameserver/model/zone/form/ZoneNPoly.java | 2 +- .../model/zone/type/L2EffectZone.java | 2 +- .../type/L2ResidenceHallTeleportZone.java | 2 +- .../gameserver/network/BlowFishKeygen.java | 2 +- .../network/L2GamePacketHandler.java | 6 +-- .../clientpackets/RequestActionUse.java | 2 +- .../RequestExEnchantItemAttribute.java | 2 +- .../clientpackets/RequestExEnchantSkill.java | 2 +- .../RequestExEnchantSkillRouteChange.java | 2 +- .../RequestExEnchantSkillSafe.java | 2 +- .../gameserverpackets/AuthRequest.java | 2 +- .../gameserverpackets/BlowFishKey.java | 2 +- .../gameserverpackets/ChangeAccessLevel.java | 2 +- .../gameserverpackets/ChangePassword.java | 2 +- .../gameserverpackets/PlayerAuthRequest.java | 2 +- .../gameserverpackets/PlayerInGame.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/ReplyCharacters.java | 2 +- .../network/gameserverpackets/SendMail.java | 2 +- .../gameserverpackets/ServerStatus.java | 2 +- .../network/gameserverpackets/TempBan.java | 2 +- .../loginserverpackets/AuthResponse.java | 2 +- .../ChangePasswordResponse.java | 2 +- .../network/loginserverpackets/InitLS.java | 2 +- .../loginserverpackets/KickPlayer.java | 2 +- .../loginserverpackets/LoginServerFail.java | 2 +- .../PlayerAuthResponse.java | 2 +- .../loginserverpackets/RequestCharacters.java | 2 +- .../l2jmobius/gameserver/util/GMAudit.java | 4 +- .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../com/l2jmobius/gameserver/util/Util.java | 2 +- .../l2jmobius/{util => log}/L2LogManager.java | 2 +- .../log/formatter/ConsoleLogFormatter.java | 4 +- .../loginserver/GameServerTable.java | 6 +-- .../loginserver/GameServerThread.java | 4 +- .../loginserver/LoginController.java | 4 +- .../l2jmobius/loginserver/SelectorHelper.java | 2 +- .../network/L2JGameServerPacketHandler.java | 2 +- .../loginserver/network/L2LoginClient.java | 6 +-- .../gameserverpackets/BlowFishKey.java | 4 +- .../gameserverpackets/ChangeAccessLevel.java | 2 +- .../gameserverpackets/ChangePassword.java | 2 +- .../gameserverpackets/GameServerAuth.java | 2 +- .../gameserverpackets/PlayerAuthRequest.java | 2 +- .../gameserverpackets/PlayerInGame.java | 2 +- .../gameserverpackets/PlayerLogout.java | 2 +- .../gameserverpackets/PlayerTracert.java | 2 +- .../gameserverpackets/ReplyCharacters.java | 2 +- .../gameserverpackets/RequestTempBan.java | 2 +- .../gameserverpackets/ServerStatus.java | 2 +- .../loginserverpackets/AuthResponse.java | 2 +- .../ChangePasswordResponse.java | 2 +- .../network/loginserverpackets/InitLS.java | 2 +- .../loginserverpackets/KickPlayer.java | 2 +- .../loginserverpackets/LoginServerFail.java | 2 +- .../PlayerAuthResponse.java | 2 +- .../loginserverpackets/RequestCharacters.java | 2 +- .../network}/util/IPv4Filter.java | 2 +- .../java/com/l2jmobius/status/Status.java | 2 +- .../util/mysql/ScriptExecutor.java | 2 +- .../geodataconverter/GeoDataConverter.java | 2 +- .../gsregistering/BaseGameServerRegister.java | 4 +- .../util/file/filter/OldPledgeFilter.java | 34 -------------- 266 files changed, 351 insertions(+), 371 deletions(-) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{util => commons}/network/BaseRecievePacket.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{util => commons}/network/BaseSendablePacket.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{util/Util.java => commons/util/CommonUtil.java} (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/DeadLockDetector.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/EmptyQueue.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/EnumIntBitmask.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/HexUtils.java (91%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/IPSubnet.java (80%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{util/data/xml => commons/util}/IXmlReader.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/PrimeFinder.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/PropertiesParser.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/Rnd.java (91%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/crypt/BlowfishEngine.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/crypt/LoginCrypt.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/crypt/NewCrypt.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/crypt/ScrambledKeyPair.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/file/filter/ExtFilter.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/file/filter/HTMLFilter.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/file/filter/NumericNameFilter.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/file/filter/SQLFilter.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => commons}/util/file/filter/XMLFilter.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{util => log}/L2LogManager.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/{ => loginserver/network}/util/IPv4Filter.java (94%) delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/OldPledgeFilter.java diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh b/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh index f2c173807d..65ff2c74f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh @@ -7,7 +7,7 @@ while :; do [ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log" [ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log" - java -Djava.util.logging.manager=com.l2jmobius.util.L2LogManager -Xms1024m -Xmx1536m -jar GameServer.jar > log/stdout.log 2>&1 + java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1 [ $? -ne 2 ] && break # /etc/init.d/mysql restart sleep 10 diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java index 6f6613464d..95dc01ba79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java @@ -18,13 +18,13 @@ package ai.group_template; import java.util.logging.Level; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.interfaces.ILocational; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java index 6ab402d656..92e5c3784e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java @@ -16,6 +16,7 @@ */ package ai.individual; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.serverpackets.PlaySound; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java index 6520e73662..1289117955 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java @@ -23,6 +23,7 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.Collection; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Object; @@ -32,7 +33,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DecoyInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java index 6c27dab784..0a55620761 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java @@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.L2Territory; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Tar Beetle zone spawn diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java index ce71b5cc2b..aaaf57c080 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java @@ -19,6 +19,7 @@ package ai.npc.NevitsHerald; import java.util.ArrayList; import java.util.List; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; @@ -28,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java index 4a6cf1a1f0..007e6e50ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java @@ -26,8 +26,8 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java index b51b9a26db..3bc231d09e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -18,6 +18,7 @@ package custom.listeners; import java.util.logging.Level; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.events.Containers; import com.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +38,6 @@ import com.l2jmobius.gameserver.model.events.impl.sieges.castle.OnCastleSiegeSta import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; import com.l2jmobius.gameserver.model.holders.ItemHolder; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 429d5688c0..13fca577e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -22,6 +22,7 @@ import java.util.List; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.instancemanager.SoIManager; @@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; import quests.Q00696_ConquerTheHallOfErosion.Q00696_ConquerTheHallOfErosion; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 253b64ec8f..c055871d04 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.L2CommandChannel; @@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; import quests.Q00697_DefendTheHallOfErosion.Q00697_DefendTheHallOfErosion; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index cb7b3037c2..96bbf3419b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -46,7 +47,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class HeartInfinityAttack extends Quest { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index ef53500c4f..96d1c9f6df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -45,7 +46,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import quests.Q00697_DefendTheHallOfErosion.Q00697_DefendTheHallOfErosion; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 8efe2e43c4..dd8ea2f552 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -53,7 +54,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java index 6e2e09bbd8..1ab994904c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java @@ -17,6 +17,7 @@ package handlers.actionhandlers; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk; import com.l2jmobius.gameserver.network.serverpackets.MoveToPawn; -import com.l2jmobius.util.Rnd; public class L2NpcAction implements IActionHandler { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 0e79085b16..0873b40a47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -27,6 +27,7 @@ import java.io.PrintStream; import java.util.StringTokenizer; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.AdminData; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -40,7 +41,6 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.PlaySound; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; /** * This class handles following admin commands: - admin = shows menu diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index e2741e9b0a..3a75e054c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -30,6 +30,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.PlayerAction; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -53,7 +54,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowTerritory; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.util.HtmlUtil; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 982caa80d4..0641736278 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Map.Entry; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.L2World; @@ -28,7 +29,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; -import com.l2jmobius.util.Rnd; /** * @author Mobius (based on Tenkai pvpzone) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index c724e964f7..d0ee327807 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.model.L2Object; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; -import com.l2jmobius.util.Rnd; /** * Confuse effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index f0f89bf83e..469b274fed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; -import com.l2jmobius.util.Rnd; /** * Death Link effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 625242e1cf..0595d61394 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -21,6 +21,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.BuffInfo; -import com.l2jmobius.util.Rnd; /** * Dispel By Slot Probability effect implementation. 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 55f6baf07e..63dcbfb179 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 @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.BaseStats; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; -import com.l2jmobius.util.Rnd; /** * Energy Attack effect implementation. 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 8aa3535904..aa3b27d5ab 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 @@ -17,6 +17,7 @@ package handlers.effecthandlers; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; @@ -39,7 +40,6 @@ import com.l2jmobius.gameserver.model.zone.type.L2FishingZone; import com.l2jmobius.gameserver.model.zone.type.L2WaterZone; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Fishing effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index c67ae6bb42..86a3c95bf4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * Harvesting effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index e364e03dc9..d89f26931b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.conditions.Condition; @@ -23,7 +24,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; /** * Lethal effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 0940c70b58..5c832e34e2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; -import com.l2jmobius.util.Rnd; /** * Magical Attack effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 478e25eaec..71fbf6c923 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; -import com.l2jmobius.util.Rnd; /** * Magical Attack By Abnormal effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index b9212d563b..c5d6d4d766 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; -import com.l2jmobius.util.Rnd; /** * Magical Soul Attack effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 303b79b9f7..a79d9799c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.entity.Instance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; /** * Open Door effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index a9d8b07623..6db41ab0e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import java.util.List; import java.util.stream.Collectors; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -26,7 +27,6 @@ import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; -import com.l2jmobius.util.Rnd; /** * Randomize Hate effect implementation. 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 fd885fefac..cba35d25b7 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 @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.L2ExtractableProductItem; import com.l2jmobius.gameserver.model.L2ExtractableSkill; import com.l2jmobius.gameserver.model.StatsSet; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; /** * Restoration Random effect implementation.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java index 73f361ad59..57f2207c93 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java @@ -16,13 +16,13 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.L2AttackableAI; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; -import com.l2jmobius.util.Rnd; /** * Run Away effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java index d0593def1e..cf2019fb26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.L2Seed; @@ -28,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * Sow effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 6cd76cbef5..86763bab36 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -16,13 +16,13 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; -import com.l2jmobius.util.Rnd; /** * Summon Cubic effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index ad496aead3..7570a97fd8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.Location; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; -import com.l2jmobius.util.Rnd; /** * Summon Npc effect implementation. 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 baa0bba0ad..22f6edbef3 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 @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.handler.TargetHandler; @@ -32,7 +33,6 @@ import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; -import com.l2jmobius.util.Rnd; /** * Trigger Skill By Attack effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ec436291eb..5c5973fd87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.handler.TargetHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; -import com.l2jmobius.util.Rnd; /** * Trigger Skill By Avoid effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 583e660052..ae949e0946 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.handler.TargetHandler; @@ -31,7 +32,6 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; -import com.l2jmobius.util.Rnd; /** * Trigger Skill By Damage effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 69cf3b7257..bc55eeb766 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.handler.TargetHandler; import com.l2jmobius.gameserver.model.L2Object; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; -import com.l2jmobius.util.Rnd; /** * Trigger Skill By Skill effect implementation. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 4641943220..9a4db4ba39 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -24,7 +25,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; /** * Unsummon effect implementation. 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 3dfeef161e..dd8bfe31f3 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 @@ -19,6 +19,7 @@ package handlers.itemhandlers; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.model.L2ExtractableProduct; @@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.items.L2EtcItem; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; /** * Extractable Items handler. 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 32247a1a29..318c32f3ff 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 @@ -16,6 +16,7 @@ */ package handlers.itemhandlers; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.Dice; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; public class RollingDice implements IItemHandler { 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 16f47b72fa..e17633990b 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 @@ -18,6 +18,7 @@ package handlers.itemhandlers; import java.util.logging.Level; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.model.actor.L2Playable; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.items.type.ActionType; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; public class SoulShots implements IItemHandler { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundPointData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundPointData.java index 541d0d477d..2ea513b90d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundPointData.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundPointData.java @@ -23,7 +23,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.util.data.xml.IXmlReader; +import com.l2jmobius.commons.util.IXmlReader; /** * Point data parser. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundSpawns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundSpawns.java index fd16d77be9..9ed7e418f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundSpawns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/HellboundSpawns.java @@ -25,10 +25,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Hellbound Spawns parser. diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index a59d3b8abd..36107bff4b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -31,6 +31,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -63,7 +64,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SpecialCamera; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; import instances.AbstractInstance; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java index a949595052..dccb322f08 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java @@ -18,6 +18,7 @@ package quests.Q00025_HidingBehindTheTruth; import java.util.HashMap; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.QuestSound; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; -import com.l2jmobius.util.Rnd; import quests.Q00024_InhabitantsOfTheForestOfTheDead.Q00024_InhabitantsOfTheForestOfTheDead; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index d5437691c4..6f72d3259c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.SkillData; @@ -41,7 +42,6 @@ import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.model.zone.L2ZoneType; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Pailaka Injured Dragon (based on same quest by Synerge?) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java index 6d86515cc6..c7dc1c1f99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java @@ -19,12 +19,12 @@ package quests.Q00356_DigUpTheSeaOfSpores; import java.util.HashMap; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Dig Up the Sea of Spores! (356) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java index 7d2e4d0730..20cab43b8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java @@ -19,13 +19,13 @@ package quests.Q00426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; -import com.l2jmobius.util.Rnd; /** * Quest for Fishing Shot (426)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index ca9502895d..211d00a558 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -21,13 +21,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * A Game of Cards (662) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java index 7965117af8..6be7ad753f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java @@ -16,13 +16,13 @@ */ package quests.Q00697_DefendTheHallOfErosion; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.instancemanager.SoIManager; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; -import com.l2jmobius.util.Rnd; public class Q00697_DefendTheHallOfErosion extends Quest { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java index c70fcd99d5..fa91a1648c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java @@ -16,13 +16,13 @@ */ package quests.Q00698_BlockTheLordsEscape; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.instancemanager.SoIManager; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; -import com.l2jmobius.util.Rnd; public class Q00698_BlockTheLordsEscape extends Quest { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java index f008754fe1..5b05ddf85b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java @@ -16,6 +16,7 @@ */ package quests.Q00708_PathToBecomingALordGludio; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; -import com.l2jmobius.util.Rnd; public class Q00708_PathToBecomingALordGludio extends Quest { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java index ff041693f3..90bd701ce8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java @@ -16,6 +16,7 @@ */ package quests.Q00709_PathToBecomingALordDion; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.FortManager; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class Q00709_PathToBecomingALordDion extends Quest { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat b/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat index 4cdb620842..5aabe300d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat @@ -5,8 +5,8 @@ title L2J Mobius - Game Server Console echo Starting Game Server. echo. -REM java -Djava.util.logging.manager=com.l2jmobius.util.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar -java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.util.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar +REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar +java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like: REM -Xms1536m diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index e83275cb61..eb52fba4a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -52,6 +52,8 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.PropertiesParser; import com.l2jmobius.gameserver.GameServer; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType; @@ -59,8 +61,6 @@ import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.util.FloodProtectorConfig; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.PropertiesParser; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class loads all the game server related configurations from files.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java index d76f869301..68d02d4171 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseFactory.java @@ -26,7 +26,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource; /** * Database Factory implementation. - * @author Zoey76 + * @author Zoey76, Mobius */ public class DatabaseFactory { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseRecievePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseRecievePacket.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.java index f9c93c11f8..9aad5fd2ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseRecievePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseRecievePacket.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 com.l2jmobius.util.network; +package com.l2jmobius.commons.network; import java.util.logging.Logger; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseSendablePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseSendablePacket.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.java index a278a1b341..3c8cab50e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/network/BaseSendablePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/network/BaseSendablePacket.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 com.l2jmobius.util.network; +package com.l2jmobius.commons.network; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/CommonUtil.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Util.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/CommonUtil.java index 3b11dfd045..e268d1588f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Util.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/CommonUtil.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.io.File; import java.io.IOException; @@ -34,12 +34,9 @@ import java.util.logging.Logger; import com.l2jmobius.Config; -/** - * Useful utilities common to L2J Server. - */ -public final class Util +public final class CommonUtil { - private static final Logger _log = Logger.getLogger(Util.class.getName()); + private static final Logger _log = Logger.getLogger(CommonUtil.class.getName()); private static final char[] ILLEGAL_CHARACTERS = { @@ -94,7 +91,7 @@ public final class Util /** * This call is equivalent to Util.printData(data, data.length) - * @see Util#printData(byte[],int) + * @see CommonUtil#printData(byte[],int) * @param data data to represent in hexadecimal * @return byte array represented in hexadecimal format */ @@ -112,7 +109,7 @@ public final class Util { final byte[] data = new byte[buf.remaining()]; buf.get(data); - final String hex = Util.printData(data, data.length); + final String hex = CommonUtil.printData(data, data.length); buf.position(buf.position() - data.length); return hex; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/DeadLockDetector.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/DeadLockDetector.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/DeadLockDetector.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/DeadLockDetector.java index b6b8313cf4..5a1dd3cec6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/DeadLockDetector.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/DeadLockDetector.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.lang.management.LockInfo; import java.lang.management.ManagementFactory; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EmptyQueue.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EmptyQueue.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EmptyQueue.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EmptyQueue.java index 7e5cf774bc..0770738eee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EmptyQueue.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EmptyQueue.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.util.Collection; import java.util.Collections; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EnumIntBitmask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EnumIntBitmask.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EnumIntBitmask.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EnumIntBitmask.java index 7ca3188cd5..de1ff03119 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/EnumIntBitmask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/EnumIntBitmask.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; /** * @author HorridoJoho diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/HexUtils.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/HexUtils.java similarity index 91% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/HexUtils.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/HexUtils.java index bd104960a7..abc6abaa6d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/HexUtils.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/HexUtils.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.util.Arrays; @@ -167,7 +167,14 @@ public class HexUtils for (int dataIdx = offset, charsIdx = dstOffset; dataIdx < (len + offset); ++dataIdx, ++charsIdx) { - dstAsciiChars[charsIdx] = (data[dataIdx] > 0x1f) && (data[dataIdx] < 0x80) ? (char) data[dataIdx] : '.'; + if ((data[dataIdx] > 0x1f) && (data[dataIdx] < 0x80)) + { + dstAsciiChars[charsIdx] = (char) data[dataIdx]; + } + else + { + dstAsciiChars[charsIdx] = '.'; + } } return dstAsciiChars; @@ -207,7 +214,7 @@ public class HexUtils else { numLines = (len / _HEX_ED_BPL) + 1; - textData = new char[(lineLength * numLines) - (_HEX_ED_BPL - lenBplMod) - _NEW_LINE_CHARS.length]; + textData = new char[(lineLength * numLines) - (_HEX_ED_BPL - (lenBplMod)) - _NEW_LINE_CHARS.length]; } // performance penalty, only doing space filling in the loop is faster @@ -238,7 +245,9 @@ public class HexUtils } else if (dataLen < _HEX_ED_BPL) { - Arrays.fill(textData, lineHexDataStart + (dataLen * _HEX_ED_CPB), lineHexDataStart + (dataLen * _HEX_ED_CPB) + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); + // last line which shows less than _HEX_ED_BPL bytes + final int lineHexDataEnd = lineHexDataStart + (dataLen * _HEX_ED_CPB); + Arrays.fill(textData, lineHexDataEnd, lineHexDataEnd + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); // spaces, for the last line if there are not _HEX_ED_BPL bytes } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IPSubnet.java similarity index 80% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IPSubnet.java index 0862f9938a..76d4316a77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IPSubnet.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.net.InetAddress; import java.net.UnknownHostException; @@ -76,26 +76,29 @@ public class IPSubnet } } } - // check for embedded v4 in v6 addr (not done !) - else if (_isIPv4) - { - // my V4 vs V6 - for (int i = 0; i < _addr.length; i++) - { - if ((addr[i + 12] & _mask[i]) != _addr[i]) - { - return false; - } - } - } else { - // my V6 vs V4 - for (int i = 0; i < _addr.length; i++) + // check for embedded v4 in v6 addr (not done !) + if (_isIPv4) { - if ((addr[i] & _mask[i + 12]) != _addr[i + 12]) + // my V4 vs V6 + for (int i = 0; i < _addr.length; i++) { - return false; + if ((addr[i + 12] & _mask[i]) != _addr[i]) + { + return false; + } + } + } + else + { + // my V6 vs V4 + for (int i = 0; i < _addr.length; i++) + { + if ((addr[i] & _mask[i + 12]) != _addr[i + 12]) + { + return false; + } } } } @@ -109,7 +112,7 @@ public class IPSubnet int size = 0; for (byte element : _mask) { - size += Integer.bitCount(element & 0xFF); + size += Integer.bitCount((element & 0xFF)); } try @@ -133,7 +136,12 @@ public class IPSubnet { return applyMask(((IPSubnet) o).getAddress()); } - return (o instanceof InetAddress) && applyMask(((InetAddress) o).getAddress()); + else if (o instanceof InetAddress) + { + return applyMask(((InetAddress) o).getAddress()); + } + + return false; } private static byte[] getMask(int n, int maxLength) throws UnknownHostException diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/data/xml/IXmlReader.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java similarity index 96% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/data/xml/IXmlReader.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java index b9e7418a23..21f6d1b894 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/data/xml/IXmlReader.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.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 com.l2jmobius.util.data.xml; +package com.l2jmobius.commons.util; import java.io.File; import java.io.FileFilter; @@ -30,7 +30,7 @@ import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; import com.l2jmobius.Config; -import com.l2jmobius.util.file.filter.XMLFilter; +import com.l2jmobius.commons.util.file.filter.XMLFilter; /** * Interface for XML parsers. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PrimeFinder.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PrimeFinder.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PrimeFinder.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PrimeFinder.java index cb88dea994..a328990491 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PrimeFinder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PrimeFinder.java @@ -9,7 +9,7 @@ * suitability of this software for any purpose. It is provided "as is" * without expressed or implied warranty. */ -package com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.util.Arrays; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PropertiesParser.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PropertiesParser.java similarity index 96% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PropertiesParser.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PropertiesParser.java index b8a1f30a64..351dc11b14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/PropertiesParser.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/PropertiesParser.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.io.File; import java.io.FileInputStream; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Rnd.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java similarity index 91% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Rnd.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.java index 1215a66c78..f9925572bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/Rnd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/Rnd.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 com.l2jmobius.util; +package com.l2jmobius.commons.util; import java.security.SecureRandom; import java.util.Random; @@ -78,7 +78,7 @@ public final class Rnd /** * Get a random double number from 0 to 1 * @return A random double number from 0 to 1 - * @see com.l2jmobius.util.Rnd#nextDouble() + * @see com.l2jmobius.commons.util.Rnd#nextDouble() */ public final double get() { @@ -206,17 +206,17 @@ public final class Rnd UNSECURE_ATOMIC, /** - * Like {@link com.l2jmobius.util.Rnd.RandomType#UNSECURE_ATOMIC}.
+ * Like {@link com.l2jmobius.commons.util.Rnd.RandomType#UNSECURE_ATOMIC}.
* Each thread has it`s own random instance.
* Provides best parallel access speed. - * @see com.l2jmobius.util.Rnd.ThreadLocalRandom + * @see com.l2jmobius.commons.util.Rnd.ThreadLocalRandom */ UNSECURE_THREAD_LOCAL, /** - * Like {@link com.l2jmobius.util.Rnd.RandomType#UNSECURE_ATOMIC}.
+ * Like {@link com.l2jmobius.commons.util.Rnd.RandomType#UNSECURE_ATOMIC}.
* Provides much faster parallel access speed. - * @see com.l2jmobius.util.Rnd.NonAtomicRandom + * @see com.l2jmobius.commons.util.Rnd.NonAtomicRandom */ UNSECURE_VOLATILE } @@ -311,7 +311,7 @@ public final class Rnd /** * Get a random double number from 0 to 1 * @return A random double number from 0 to 1 - * @see com.l2jmobius.util.Rnd#nextDouble() + * @see com.l2jmobius.commons.util.Rnd#nextDouble() */ public static double get() { @@ -437,8 +437,8 @@ public final class Rnd /** * @param n - * @return - * @see com.l2jmobius.util.Rnd#get(int n) + * @return int + * @see com.l2jmobius.commons.util.Rnd#get(int n) */ public static int nextInt(int n) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/BlowfishEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/BlowfishEngine.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/BlowfishEngine.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/BlowfishEngine.java index d255958600..7891b8287f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/BlowfishEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/BlowfishEngine.java @@ -15,7 +15,7 @@ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.l2jmobius.util.crypt; +package com.l2jmobius.commons.util.crypt; import java.io.IOException; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/LoginCrypt.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/LoginCrypt.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/LoginCrypt.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/LoginCrypt.java index 79265bc171..c65e884f45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/LoginCrypt.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/LoginCrypt.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 com.l2jmobius.util.crypt; +package com.l2jmobius.commons.util.crypt; import java.io.IOException; -import com.l2jmobius.util.Rnd; +import com.l2jmobius.commons.util.Rnd; /** * @author KenM diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/NewCrypt.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/NewCrypt.java similarity index 96% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/NewCrypt.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/NewCrypt.java index fcde1580b7..bd37677f76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/NewCrypt.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/NewCrypt.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 com.l2jmobius.util.crypt; +package com.l2jmobius.commons.util.crypt; /** * Class to use a blowfish cipher with ECB processing.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/ScrambledKeyPair.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.java index d8aa581edb..ccb4157b40 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/crypt/ScrambledKeyPair.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/ScrambledKeyPair.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 com.l2jmobius.util.crypt; +package com.l2jmobius.commons.util.crypt; import java.math.BigInteger; import java.security.KeyPair; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/ExtFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/ExtFilter.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/ExtFilter.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/ExtFilter.java index 97e8fabb3c..40419941e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/ExtFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/ExtFilter.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 com.l2jmobius.util.file.filter; +package com.l2jmobius.commons.util.file.filter; import java.io.File; import java.io.FileFilter; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/HTMLFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/HTMLFilter.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/HTMLFilter.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/HTMLFilter.java index d43c84ba2d..1c88fbb614 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/HTMLFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/HTMLFilter.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 com.l2jmobius.util.file.filter; +package com.l2jmobius.commons.util.file.filter; import java.io.File; import java.io.FileFilter; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/NumericNameFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/NumericNameFilter.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/NumericNameFilter.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/NumericNameFilter.java index 45bf42eb10..424112cb65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/NumericNameFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/NumericNameFilter.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 com.l2jmobius.util.file.filter; +package com.l2jmobius.commons.util.file.filter; import java.io.File; import java.io.FileFilter; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/SQLFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/SQLFilter.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/SQLFilter.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/SQLFilter.java index 120227bc0f..bea47afb2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/SQLFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/SQLFilter.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 com.l2jmobius.util.file.filter; +package com.l2jmobius.commons.util.file.filter; import java.io.File; import java.io.FileFilter; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/XMLFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/XMLFilter.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/XMLFilter.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/XMLFilter.java index 7e2180df24..1a6fb1a6df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/XMLFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/file/filter/XMLFilter.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 com.l2jmobius.util.file.filter; +package com.l2jmobius.commons.util.file.filter; import java.io.File; import java.io.FileFilter; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java index acfd9d0d85..3e3e190be1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java @@ -34,6 +34,7 @@ import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.mmocore.SelectorConfig; import com.l2jmobius.commons.mmocore.SelectorThread; +import com.l2jmobius.commons.util.DeadLockDetector; import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; @@ -139,9 +140,8 @@ import com.l2jmobius.gameserver.network.L2GamePacketHandler; import com.l2jmobius.gameserver.scripting.ScriptEngineManager; import com.l2jmobius.gameserver.taskmanager.KnownListUpdateTaskManager; import com.l2jmobius.gameserver.taskmanager.TaskManager; +import com.l2jmobius.loginserver.network.util.IPv4Filter; import com.l2jmobius.status.Status; -import com.l2jmobius.util.DeadLockDetector; -import com.l2jmobius.util.IPv4Filter; public final class GameServer { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java index 6d1b85fa06..393563efca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -44,6 +44,10 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.network.BaseSendablePacket; +import com.l2jmobius.commons.util.Rnd; +import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.L2GameClient; @@ -71,10 +75,6 @@ import com.l2jmobius.gameserver.network.loginserverpackets.RequestCharacters; import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; import com.l2jmobius.gameserver.network.serverpackets.LoginFail; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.Util; -import com.l2jmobius.util.crypt.NewCrypt; -import com.l2jmobius.util.network.BaseSendablePacket; public class LoginServerThread extends Thread { @@ -124,7 +124,7 @@ public class LoginServerThread extends Thread if (_hexID == null) { _requestID = Config.REQUEST_ID; - _hexID = Util.generateHex(16); + _hexID = CommonUtil.generateHex(16); } else { @@ -156,7 +156,7 @@ public class LoginServerThread extends Thread _out = new BufferedOutputStream(_loginSocket.getOutputStream()); // init Blowfish - final byte[] blowfishKey = Util.generateHex(40); + final byte[] blowfishKey = CommonUtil.generateHex(40); // Protect the new blowfish key what cannot begin with zero if (blowfishKey[0] == 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/MonsterRace.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/MonsterRace.java index 94a86b6c74..a35bca83a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/MonsterRace.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/MonsterRace.java @@ -19,10 +19,10 @@ package com.l2jmobius.gameserver; import java.util.logging.Level; import java.util.logging.Logger; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; -import com.l2jmobius.util.Rnd; public class MonsterRace { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java index b44ad2bf57..d918755424 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/RecipeController.java @@ -25,6 +25,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.RecipeData; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.StatType; @@ -51,7 +52,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SetupGauge; import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class RecipeController { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index a2cd25451f..8f218e1599 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -33,6 +33,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; @@ -58,7 +59,6 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Seven Signs Festival of Darkness Engine.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 4dc1322b8f..82b139cf90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -27,6 +27,7 @@ import java.util.concurrent.Future; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.datatables.SkillData; @@ -60,7 +61,6 @@ import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * This class manages AI of L2Attackable. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index ba2641f036..01394b3e97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -31,6 +31,7 @@ import java.util.List; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -58,7 +59,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * This class manages AI of L2Character.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index f58130ef74..cec33dc0e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -22,6 +22,7 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK; import java.util.List; import java.util.stream.Collectors; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.MobGroup; import com.l2jmobius.gameserver.model.MobGroupTable; @@ -35,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * AI for controllable mobs diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index de7b4beef2..976c2a7e26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Object; @@ -40,7 +41,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * This class manages AI of L2Attackable. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 11b02d6a26..21571d00cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Object; @@ -39,7 +40,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * This class manages AI of L2Attackable. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index f62886d818..6f5884a64b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -24,12 +24,12 @@ import java.util.concurrent.Future; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.Rnd; public class L2SummonAI extends L2PlayableAI implements Runnable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java index d965e69ba8..e7c85bcab9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -26,8 +26,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.file.filter.HTMLFilter; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.file.filter.HTMLFilter; /** * @author Layane diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 150e58765d..d0aac12f5f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -31,6 +31,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.EnumIntBitmask; import com.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.CHSiegeManager; @@ -60,7 +61,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.EnumIntBitmask; /** * This class loads the clan related data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java index 9e78133109..19f9d4c99f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -28,6 +28,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.L2AccessLevel; import com.l2jmobius.gameserver.model.L2AdminCommandAccessRight; import com.l2jmobius.gameserver.model.StatsSet; @@ -35,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads administrator access levels and commands. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java index 204c199ed5..d33d2efeeb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java @@ -23,9 +23,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.L2ArmorSet; import com.l2jmobius.gameserver.model.holders.SkillHolder; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads armor set bonuses. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java index 506efb67da..e3c2cfe157 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java @@ -32,12 +32,12 @@ import org.w3c.dom.Node; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.file.filter.NumericNameFilter; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.model.buylist.L2BuyList; import com.l2jmobius.gameserver.model.buylist.Product; import com.l2jmobius.gameserver.model.items.L2Item; -import com.l2jmobius.util.data.xml.IXmlReader; -import com.l2jmobius.util.file.filter.NumericNameFilter; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java index 27e67fd7ee..de5479de05 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java @@ -27,8 +27,8 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.enums.CategoryType; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads the category data with Class or NPC IDs. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java index 270fd38cf8..d35b9f9f8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java @@ -23,9 +23,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.model.base.ClassInfo; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads the the list of classes and it's info. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java index 470301b151..a9e7b45640 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -28,13 +28,13 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.templates.L2DoorTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads doors. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index d7802d1fb0..7af4b57e19 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -24,11 +24,11 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads item enchant data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java index 80b9cef681..356fccd37d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java @@ -24,6 +24,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.model.holders.RangeChanceHolder; import com.l2jmobius.gameserver.model.items.L2Item; @@ -31,7 +32,6 @@ import com.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; import com.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; import com.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java index 682d3cca53..67e712c360 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java @@ -25,6 +25,7 @@ import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.StatFunction; import com.l2jmobius.gameserver.model.items.L2Item; @@ -32,7 +33,6 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.CrystalType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java index f53ed9426a..18f28f5d15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java @@ -23,10 +23,10 @@ import java.util.logging.Level; import org.w3c.dom.Document; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.options.EnchantOptions; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 018f9ff739..7cc2e9d0c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -25,13 +25,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.L2EnchantSkillGroup; import com.l2jmobius.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder; import com.l2jmobius.gameserver.model.L2EnchantSkillLearn; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Enchant Groups information. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java index 66a6c3bce9..eba8f5c95f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java @@ -23,7 +23,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.util.data.xml.IXmlReader; +import com.l2jmobius.commons.util.IXmlReader; /** * This class holds the Experience points for each level for players and pets. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java index 7bf6f43bea..8fb78e3284 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java @@ -25,9 +25,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.fishing.L2Fish; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Fish information. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java index 4c7e4c9ee3..668e3fedad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java @@ -23,9 +23,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.fishing.L2FishingMonster; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Fishing Monsters information. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java index 2714ce03a3..65e7e4664e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java @@ -23,9 +23,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.fishing.L2FishingRod; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Fishing Rods information. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java index ba1be44000..737bb99223 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -25,10 +25,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.model.items.L2Henna; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the henna related information.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java index b2634de946..7a4dd6758e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java @@ -20,9 +20,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.actor.L2Character; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class load, holds and calculates the hit condition bonuses. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 7eb30f7f0d..785f0b44e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -26,10 +26,10 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.model.items.PcItemTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java index 3a8575a2bf..980d74f1fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java @@ -25,6 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.enums.MacroType; import com.l2jmobius.gameserver.enums.ShortcutType; import com.l2jmobius.gameserver.model.Macro; @@ -34,7 +35,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class holds the Initial Shortcuts information.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ItemMallData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ItemMallData.java index 6b011c055c..42005f9126 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ItemMallData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ItemMallData.java @@ -26,9 +26,9 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.ItemMallProduct; import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java index da0da4b47e..6de0d32cae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java @@ -24,7 +24,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.util.data.xml.IXmlReader; +import com.l2jmobius.commons.util.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 9ce8df37f0..c2dece8dee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -29,6 +29,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.file.filter.NumericNameFilter; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -42,8 +44,6 @@ import com.l2jmobius.gameserver.network.serverpackets.MultiSellList; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; -import com.l2jmobius.util.file.filter.NumericNameFilter; public final class MultisellData implements IXmlReader { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java index 1dea72cc01..c61523a568 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -34,6 +34,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.AISkillScope; @@ -47,7 +48,6 @@ import com.l2jmobius.gameserver.model.holders.MinionHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; /** * NPC data parser. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java index e39a1d70a2..3cd925a3ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -24,13 +24,13 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.options.Options; import com.l2jmobius.gameserver.model.options.OptionsSkillHolder; import com.l2jmobius.gameserver.model.options.OptionsSkillType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Item Option data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index 0e325580b8..1ba066e069 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -23,11 +23,11 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.enums.MountType; import com.l2jmobius.gameserver.model.L2PetData; import com.l2jmobius.gameserver.model.L2PetLevelData; import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class parse and hold all pet parameters.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java index 14ad4f74dc..0d474ade0b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java @@ -27,10 +27,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.holders.SkillHolder; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index 52acdc627d..9ddbfb2a9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -26,11 +26,11 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.templates.L2PcTemplate; import com.l2jmobius.gameserver.model.base.ClassId; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Loads player's base stats. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java index 63481a5fba..a39a095161 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java @@ -22,7 +22,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.util.data.xml.IXmlReader; +import com.l2jmobius.commons.util.IXmlReader; /** * This class holds the Player Xp Percent Lost Data for each level for players. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 11302b5b0d..d556126f46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -25,12 +25,12 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.L2RecipeInstance; import com.l2jmobius.gameserver.model.L2RecipeList; import com.l2jmobius.gameserver.model.L2RecipeStatInstance; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.util.data.xml.IXmlReader; /** * The Class RecipeData. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java index dc25304e78..29ca0af890 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java @@ -24,7 +24,7 @@ import java.util.logging.Level; import org.w3c.dom.Document; import org.w3c.dom.Node; -import com.l2jmobius.util.data.xml.IXmlReader; +import com.l2jmobius.commons.util.IXmlReader; /** * Secondary Auth data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 003503a3c3..8fdf463060 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -25,10 +25,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.SiegeScheduleDate; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java index 0a7b3f235f..65e7c629fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java @@ -24,8 +24,8 @@ import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.base.ClassId; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Holds all skill learn data for all NPCs. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 4f4499abdf..b70048b07c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -32,6 +32,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.L2Clan; @@ -49,7 +50,6 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.interfaces.ISkillsHolder; import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class loads and manage the characters and pledges skills trees.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index e4126f24ce..abc8bfcd61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -24,10 +24,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2StaticObjectInstance; import com.l2jmobius.gameserver.model.actor.templates.L2CharTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class loads and holds all static object data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java index 64f847437d..fbd5bf9d97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -24,6 +24,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.transform.Transform; @@ -33,7 +34,6 @@ import com.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import com.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java index 11439a5eed..09cc8e2993 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java @@ -25,8 +25,8 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.ActionKey; -import com.l2jmobius.util.data.xml.IXmlReader; /** * UI Data parser. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index f21c044ca9..1a29f37f2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -31,6 +31,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.OptionData; import com.l2jmobius.gameserver.model.L2Augmentation; import com.l2jmobius.gameserver.model.holders.SkillHolder; @@ -38,7 +39,6 @@ import com.l2jmobius.gameserver.model.items.L2Item; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.options.Options; import com.l2jmobius.gameserver.network.clientpackets.AbstractRefinePacket; -import com.l2jmobius.util.Rnd; /** * Loads augmentation bonuses and skills. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java index 2eaa5e7b78..577a07d5cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java @@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.datatables; import java.util.HashMap; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.util.Rnd; /** * This class holds parameter, specific to certain NPCs.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java index da8e3ab45a..0cbf09f0fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java @@ -35,13 +35,13 @@ import org.w3c.dom.Node; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Spawn data retriever. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java index 9b68d124fb..2f24589f24 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java @@ -23,12 +23,12 @@ import java.util.Map; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.file.filter.XMLFilter; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.engines.items.DocumentItem; import com.l2jmobius.gameserver.engines.skills.DocumentSkill; import com.l2jmobius.gameserver.model.items.L2Item; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.file.filter.XMLFilter; /** * @author mkizub diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java index ce08284f39..5e73bb86f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/idfactory/BitSetIDFactory.java @@ -20,7 +20,7 @@ import java.util.BitSet; import java.util.concurrent.atomic.AtomicInteger; import com.l2jmobius.commons.concurrent.ThreadPool; -import com.l2jmobius.util.PrimeFinder; +import com.l2jmobius.commons.util.PrimeFinder; /** * This class .. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 8436f96c1a..1e796c8f3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -37,6 +37,8 @@ import org.w3c.dom.Node; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.ManorMode; import com.l2jmobius.gameserver.model.CropProcure; import com.l2jmobius.gameserver.model.L2Clan; @@ -48,8 +50,6 @@ import com.l2jmobius.gameserver.model.entity.Castle; import com.l2jmobius.gameserver.model.interfaces.IStorable; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Castle manor system. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index efda600665..bc5900f021 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -35,6 +35,7 @@ import org.w3c.dom.Node; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.model.DimensionalRiftRoom; import com.l2jmobius.gameserver.model.L2Spawn; @@ -44,7 +45,6 @@ import com.l2jmobius.gameserver.model.entity.DimensionalRift; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Dimensional Rift manager. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java index 9f24419693..b698d7f905 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -22,11 +22,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Duel; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; -import com.l2jmobius.util.Rnd; public final class DuelManager { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index cd287a27c9..299e79ed20 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -29,13 +29,13 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author n0nam3 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 7a25cc17e8..6b1105741d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.DoorData; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.instancemanager.tasks.FourSepulchersChangeAttackTimeTask; @@ -54,7 +55,6 @@ import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Zoey76: TODO: Use Location DTO instead of array of int. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 5e5d9b5cab..ac78778a1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -28,10 +28,10 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Instance; import com.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import com.l2jmobius.util.data.xml.IXmlReader; /** * @author evill33t, GodKratos diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java index b933fa0404..9ca6f99e80 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -24,6 +24,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.SevenSigns; import com.l2jmobius.gameserver.model.L2MapRegion; import com.l2jmobius.gameserver.model.L2Object; @@ -40,7 +41,6 @@ import com.l2jmobius.gameserver.model.entity.Instance; import com.l2jmobius.gameserver.model.entity.clanhall.SiegableHall; import com.l2jmobius.gameserver.model.zone.type.L2ClanHallZone; import com.l2jmobius.gameserver.model.zone.type.L2RespawnZone; -import com.l2jmobius.util.data.xml.IXmlReader; /** * Map Region Manager. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java index 746f00f93b..76f3adec8c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java @@ -22,9 +22,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.scripting.ScriptEngineManager; -import com.l2jmobius.util.Util; /** * Quests and scripts manager. @@ -197,7 +197,7 @@ public final class QuestManager if (Config.ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS) { final String questName = quest.getName().contains("_") ? quest.getName().substring(quest.getName().indexOf('_') + 1) : quest.getName(); - _log.info("Loaded quest " + Util.splitWords(questName) + "."); + _log.info("Loaded quest " + CommonUtil.splitWords(questName) + "."); } } @@ -256,7 +256,7 @@ public final class QuestManager if (Config.ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS) { - _log.info("Loaded script " + Util.splitWords(script.getClass().getSimpleName()) + "."); + _log.info("Loaded script " + CommonUtil.splitWords(script.getClass().getSimpleName()) + "."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index c7a8998430..9e0a784f10 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -31,11 +31,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance; -import com.l2jmobius.util.Rnd; /** * Raid Boss spawn manager. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index 870c6a0f14..d89bea7b03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -29,6 +29,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.PropertiesParser; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2Object; @@ -39,7 +40,6 @@ import com.l2jmobius.gameserver.model.entity.Castle; import com.l2jmobius.gameserver.model.entity.Siege; import com.l2jmobius.gameserver.model.interfaces.ILocational; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.PropertiesParser; public final class SiegeManager { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java index c162d9d1db..d2f86130f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -20,11 +20,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.DoorData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class SoIManager { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index 86a7b5e2d5..7381be7652 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -34,6 +34,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.PropertiesParser; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.datatables.SkillData; @@ -59,7 +60,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Broadcast; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.PropertiesParser; public final class TerritoryWarManager implements Siegable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 4a0a2b8552..ba95e86bbe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -26,6 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask; @@ -40,7 +41,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMoveNodeArrived; import com.l2jmobius.gameserver.model.holders.NpcRoutesHolder; import com.l2jmobius.gameserver.network.NpcStringId; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class manages walking monsters. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 80ca162894..be9e82c416 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -29,6 +29,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.commons.util.IXmlReader; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2WorldRegion; @@ -45,7 +46,6 @@ import com.l2jmobius.gameserver.model.zone.type.L2ArenaZone; import com.l2jmobius.gameserver.model.zone.type.L2OlympiadStadiumZone; import com.l2jmobius.gameserver.model.zone.type.L2RespawnZone; import com.l2jmobius.gameserver.model.zone.type.NpcSpawnTerritory; -import com.l2jmobius.util.data.xml.IXmlReader; /** * This class manages the zones diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java index 42bdda815b..634015f337 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -28,11 +28,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; public class Lottery { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 820c191990..6863e71ff6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -20,12 +20,12 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author Battlecruiser diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java index cfceb791ff..938ff55c1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java @@ -36,13 +36,13 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.interfaces.IIdentifiable; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; /** * Auto Spawn handler.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java index cf26d20039..403b02cfb8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -26,6 +26,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.TransformData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -47,7 +48,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; public class CursedWeapon implements INamable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DimensionalRiftRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DimensionalRiftRoom.java index 4079e8f0d9..a7bffbb010 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DimensionalRiftRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DimensionalRiftRoom.java @@ -21,7 +21,7 @@ import java.awt.Shape; import java.util.ArrayList; import java.util.List; -import com.l2jmobius.util.Rnd; +import com.l2jmobius.commons.util.Rnd; /** * Dimensional Rift Room. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java index 1846232849..80bba4b632 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.EnumIntBitmask; import com.l2jmobius.gameserver.communitybbs.BB.Forum; import com.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; @@ -76,7 +77,6 @@ import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.EnumIntBitmask; public class L2Clan implements IIdentifiable, INamable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java index b8684c015d..a1e65b6dc5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2GroupSpawn.java @@ -18,11 +18,11 @@ package com.l2jmobius.gameserver.model; import java.util.logging.Level; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2ControllableMobInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; -import com.l2jmobius.util.Rnd; /** * @author littlecrow A special spawn implementation to spawn controllable mob diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2MapRegion.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2MapRegion.java index 185698f930..fe88364ae1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2MapRegion.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2MapRegion.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.Race; -import com.l2jmobius.util.Rnd; /** * @author Nyaran diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index 76a0ca096a..e156a05601 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -29,6 +29,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.SevenSignsFestival; import com.l2jmobius.gameserver.datatables.ItemTable; @@ -59,7 +60,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PartySmallWindowDelete; import com.l2jmobius.gameserver.network.serverpackets.PartySmallWindowDeleteAll; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * This class serves as a container for player parties. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java index 90001df672..88b9ccba51 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -28,6 +28,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.NpcPersonalAIData; @@ -41,7 +42,6 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.interfaces.IPositionable; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.type.NpcSpawnTerritory; -import com.l2jmobius.util.Rnd; /** * This class manages the spawn and respawn of a group of L2NpcInstance that are in the same are and have the same type.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java index 70a4bc4c16..b94fcd2bc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; -import com.l2jmobius.util.Rnd; +import com.l2jmobius.commons.util.Rnd; /** * @version 0.1, 2005-03-12 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java index 9fd9311761..e389bea0c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/MobGroup.java @@ -20,6 +20,7 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2ControllableMobAI; import com.l2jmobius.gameserver.datatables.SpawnTable; @@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2ControllableMobInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; -import com.l2jmobius.util.Rnd; /** * @author littlecrow diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java index 6a35e3c68c..bfa4e9f67e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java @@ -18,11 +18,11 @@ package com.l2jmobius.gameserver.model; import java.util.concurrent.ScheduledFuture; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMoveRouteFinished; -import com.l2jmobius.util.Rnd; /** * Holds info about current walk progress. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 10eae85653..60671dd6e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -27,6 +27,7 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2AttackableAI; @@ -71,7 +72,6 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class L2Attackable extends L2Npc { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 79e382a587..7c666ee441 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -36,6 +36,8 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.EmptyQueue; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -145,8 +147,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.TeleportToLocation; import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.EmptyQueue; -import com.l2jmobius.util.Rnd; /** * Mother class of all character objects of the world (PC, NPC...)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index d4daa420f3..5db43c921f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -27,6 +27,7 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.SevenSigns; import com.l2jmobius.gameserver.SevenSignsFestival; @@ -97,7 +98,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; import com.l2jmobius.gameserver.util.Broadcast; -import com.l2jmobius.util.Rnd; /** * This class represents a Non-Player-Character in the world.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 9bed09a61f..f763c6d8a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -17,6 +17,7 @@ package com.l2jmobius.gameserver.model.actor; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2SummonAI; @@ -68,7 +69,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.TeleportToLocation; import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public abstract class L2Summon extends L2Playable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java index 208e3a8792..04ffcc3cd2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.PetDataTable; import com.l2jmobius.gameserver.datatables.SkillData; @@ -36,7 +37,6 @@ import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; public final class L2BabyPetInstance extends L2PetInstance { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java index 6e182b15e5..9070fc9e53 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.model.ArenaParticipantsHolder; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -26,7 +27,6 @@ import com.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; -import com.l2jmobius.util.Rnd; /** * @author BiggBoss diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index 7caaa64148..a4501d5751 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -23,6 +23,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.instancemanager.DuelManager; @@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.SystemMessageId; -import com.l2jmobius.util.Rnd; public final class L2CubicInstance implements IIdentifiable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 051e4c672e..ec55ee4535 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -24,6 +24,7 @@ import java.util.concurrent.Future; import java.util.logging.Level; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2DoorAI; import com.l2jmobius.gameserver.data.xml.impl.DoorData; @@ -56,7 +57,6 @@ import com.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; import com.l2jmobius.gameserver.network.serverpackets.StaticObject; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; public class L2DoorInstance extends L2Character { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java index b6499ca237..258c4e0faf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -24,7 +25,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.entity.Hero; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * This class manages all Grand Bosses. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index e404331fc5..4eacbcf064 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.model.L2World; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; -import com.l2jmobius.util.Rnd; /** * This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 028336403f..cebfc6db77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -47,6 +47,8 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.EnumIntBitmask; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.LoginServerThread; @@ -323,8 +325,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import com.l2jmobius.gameserver.util.Broadcast; import com.l2jmobius.gameserver.util.FloodProtectors; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.EnumIntBitmask; -import com.l2jmobius.util.Rnd; /** * This class represents all player characters in the world.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index 99f4e14b90..87b9c548e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -28,6 +28,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import com.l2jmobius.gameserver.data.sql.impl.SummonEffectsTable; @@ -69,7 +70,6 @@ import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.StopMove; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; -import com.l2jmobius.util.Rnd; public class L2PetInstance extends L2Summon { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java index 347974f5bf..de2573d3df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java @@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import com.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; @@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.entity.Hero; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * This class manages all RaidBoss.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java index 9a60e98883..992b839f6a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.DoorData; import com.l2jmobius.gameserver.enums.ChatType; @@ -37,7 +38,6 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * @author sandman diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java index d073a0b69a..2b0400014b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java @@ -23,6 +23,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.SkillData; @@ -37,7 +38,6 @@ import com.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.StopMove; -import com.l2jmobius.util.Rnd; // While a tamed beast behaves a lot like a pet (ingame) and does have // an owner, in all other aspects, it acts like a mob. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 0cb675bb9e..8cc29585bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -23,10 +23,10 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.stats.Formulas; -import com.l2jmobius.util.Rnd; public class CharStatus { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 2518000484..d8e1aff11f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -17,6 +17,7 @@ package com.l2jmobius.gameserver.model.actor.status; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.PrivateStoreType; import com.l2jmobius.gameserver.instancemanager.DuelManager; @@ -33,7 +34,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class PcStatus extends PlayableStatus { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java index fcb91de052..c86f990664 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/cubics/CubicAction.java @@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; @@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; -import com.l2jmobius.util.Rnd; /** * Cubic action task. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java index 6d520452f8..ade89a88c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.model.actor.tasks.player; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.util.Rnd; /** * Task dedicated for looking for fishes. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java index 850fc326a4..9c3f166ae0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.AISkillScope; @@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.items.L2Item; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * NPC template. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2PcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2PcTemplate.java index db45f9d959..6cae25d4f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2PcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2PcTemplate.java @@ -20,12 +20,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.ExperienceData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.base.ClassId; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; -import com.l2jmobius.util.Rnd; /** * @author mkizub, Zoey76 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 48a17ce0e3..4a1a42dac9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -16,10 +16,10 @@ */ package com.l2jmobius.gameserver.model.conditions; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.L2Item; import com.l2jmobius.gameserver.model.skills.Skill; -import com.l2jmobius.util.Rnd; /** * The Class ConditionGameChance. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 34fe489bf1..92d7fc8f8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -26,6 +26,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.enums.Team; @@ -48,7 +49,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameEnd; import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author BiggBoss diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/DimensionalRift.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/DimensionalRift.java index 0f38899bc8..0f88b23c0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/DimensionalRift.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/DimensionalRift.java @@ -25,6 +25,7 @@ import java.util.concurrent.Future; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.instancemanager.DimensionalRiftManager; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.model.L2Party; @@ -34,7 +35,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.network.serverpackets.Earthquake; -import com.l2jmobius.util.Rnd; /** * Thanks to L2Fortress and balancer.ru - kombat diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java index 751069ee2b..e7c4613875 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -25,6 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.DuelResult; import com.l2jmobius.gameserver.enums.Team; @@ -49,7 +50,6 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.PlaySound; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; public class Duel { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java index ad0e88cfff..a889991dc3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java @@ -23,11 +23,11 @@ import java.sql.SQLException; import java.util.concurrent.ScheduledFuture; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.MailManager; import com.l2jmobius.gameserver.model.itemcontainer.Mail; -import com.l2jmobius.util.Rnd; /** * @author Migi, DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java index 45b191ff12..1a61b583e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -24,6 +24,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.data.xml.impl.DoorData; import com.l2jmobius.gameserver.datatables.ItemTable; @@ -54,7 +55,6 @@ import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author HorridoJoho diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventTeleporter.java index 0a44cf4ec1..6f73027ef9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventTeleporter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEventTeleporter.java @@ -18,10 +18,10 @@ package com.l2jmobius.gameserver.model.entity; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.util.Rnd; public class TvTEventTeleporter implements Runnable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index e64b758655..951b2b3513 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -33,6 +33,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.DoorData; @@ -128,7 +129,6 @@ import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.scripting.ManagedScript; import com.l2jmobius.gameserver.util.MinionList; -import com.l2jmobius.util.Rnd; /** * @author UnAfraid @@ -2578,7 +2578,7 @@ public abstract class AbstractScript extends ManagedScript /** * Get a random integer from 0 (inclusive) to {@code max} (exclusive).
- * Use this method instead of importing {@link com.l2jmobius.util.Rnd} utility. + * Use this method instead of importing {@link com.l2jmobius.commons.util.Rnd} utility. * @param max the maximum value for randomization * @return a random integer number from 0 to {@code max - 1} */ @@ -2589,7 +2589,7 @@ public abstract class AbstractScript extends ManagedScript /** * Get a random integer from {@code min} (inclusive) to {@code max} (inclusive).
- * Use this method instead of importing {@link com.l2jmobius.util.Rnd} utility. + * Use this method instead of importing {@link com.l2jmobius.commons.util.Rnd} utility. * @param min the minimum value for randomization * @param max the maximum value for randomization * @return a random integer number from {@code min} to {@code max} @@ -2601,7 +2601,7 @@ public abstract class AbstractScript extends ManagedScript /** * Get a random boolean.
- * Use this method instead of importing {@link com.l2jmobius.util.Rnd} utility. + * Use this method instead of importing {@link com.l2jmobius.commons.util.Rnd} utility. * @return {@code true} or {@code false} randomly */ public static boolean getRandomBoolean() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java index 1a34f413b3..71fbaaca5e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java @@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.PriorityBlockingQueue; import java.util.function.Predicate; +import com.l2jmobius.commons.util.EmptyQueue; import com.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; -import com.l2jmobius.util.EmptyQueue; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java index c9fdcb1944..3ced389e1c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.model.fishing; import java.util.concurrent.Future; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.FishingMonstersData; import com.l2jmobius.gameserver.instancemanager.FishingChampionshipManager; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExFishingHpRegen; import com.l2jmobius.gameserver.network.serverpackets.ExFishingStartCombat; import com.l2jmobius.gameserver.network.serverpackets.PlaySound; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; public class L2Fishing implements Runnable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 1fe09fd1c2..7e56fb6749 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,6 +41,7 @@ import org.w3c.dom.Node; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.sql.impl.CharNameTable; import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.instancemanager.ItemAuctionManager; @@ -50,7 +51,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; public final class ItemAuctionInstance { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e938fe87a3..67c2883e05 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -26,6 +26,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.data.xml.impl.ArmorSetsData; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.ItemLocation; @@ -41,7 +42,6 @@ import com.l2jmobius.gameserver.model.items.type.EtcItemType; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; -import com.l2jmobius.util.Util; /** * This class manages inventory @@ -1443,7 +1443,7 @@ public abstract class Inventory extends ItemContainer default: { _log.info("Unhandled slot type: " + slot); - _log.info(Util.getTraceString(Thread.currentThread().getStackTrace())); + _log.info(CommonUtil.getTraceString(Thread.currentThread().getStackTrace())); } } if (pdollSlot >= 0) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index fdc5216d0c..8f0ed39970 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -20,13 +20,13 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.EtcItemType; import com.l2jmobius.gameserver.model.items.type.ItemType; -import com.l2jmobius.util.Rnd; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java index e4b79de571..2811450b34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.olympiad; import java.util.List; import com.l2jmobius.Config; -import com.l2jmobius.util.Rnd; +import com.l2jmobius.commons.util.Rnd; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index d31b877c0f..7f0b799e75 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -26,6 +26,7 @@ import java.util.logging.LogRecord; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -38,7 +39,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExOlympiadMatchResult; import com.l2jmobius.gameserver.network.serverpackets.ExOlympiadUserInfo; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author GodKratos, Pere, DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java index eaecb12a1a..24749ef65c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.logging.Level; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; @@ -32,7 +33,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExOlympiadMatchResult; import com.l2jmobius.gameserver.network.serverpackets.ExOlympiadUserInfo; import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import com.l2jmobius.util.Rnd; /** * @author Pere, DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java index 95733dc784..2cc96ab98b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -34,6 +34,8 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; +import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.CategoryType; @@ -64,8 +66,6 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneType; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcQuestHtmlMessage; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.Util; /** * Quest main class. @@ -1397,7 +1397,7 @@ public class Quest extends AbstractScript implements IIdentifiable { _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); } - return (player != null) && player.getAccessLevel().isGm() && showResult(player, "Script error" + Util.getStackTrace(t) + ""); + return (player != null) && player.getAccessLevel().isGm() && showResult(player, "Script error" + CommonUtil.getStackTrace(t) + ""); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index af1e7e48c3..b4842098f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -28,6 +28,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.MountType; @@ -65,7 +66,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public final class Skill implements IIdentifiable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 3f58abac0a..7e77eca5db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.SevenSigns; import com.l2jmobius.gameserver.SevenSignsFestival; import com.l2jmobius.gameserver.data.xml.impl.HitConditionBonusData; @@ -76,7 +77,6 @@ import com.l2jmobius.gameserver.model.zone.type.L2MotherTreeZone; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; /** * Global calculations. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java index 9d454248d5..e99617308c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneRespawn.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.util.Rnd; /** * Abstract zone with spawn locations diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index dbd264d55f..ab39a95652 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -18,10 +18,10 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Rectangle; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; -import com.l2jmobius.util.Rnd; /** * A primitive rectangular zone diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index e0bfbfff50..c8257df4cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -16,10 +16,10 @@ */ package com.l2jmobius.gameserver.model.zone.form; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; -import com.l2jmobius.util.Rnd; /** * A primitive circular zone diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 8aee86a012..3afd22e684 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -18,10 +18,10 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Polygon; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.geoengine.GeoEngine; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; -import com.l2jmobius.util.Rnd; /** * A not so primitive npoly zone diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index 9f59b0dc4b..5fc5a34037 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -21,6 +21,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneType; import com.l2jmobius.gameserver.model.zone.TaskZoneSettings; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; -import com.l2jmobius.util.Rnd; /** * another type of damage zone with skills diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java index 8fc52c30bf..20fecc0cae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java @@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.model.zone.type; import java.util.concurrent.ScheduledFuture; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.util.Rnd; /** * Teleport residence zone for clan hall sieges diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java index c9eb6fdab2..96edb0cb77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network; -import com.l2jmobius.util.Rnd; +import com.l2jmobius.commons.util.Rnd; /** * Blowfish keygen for GameServer client connections. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java index ee1bf18fbf..2b862689e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java @@ -25,9 +25,9 @@ import com.l2jmobius.commons.mmocore.IMMOExecutor; import com.l2jmobius.commons.mmocore.IPacketHandler; import com.l2jmobius.commons.mmocore.MMOConnection; import com.l2jmobius.commons.mmocore.ReceivablePacket; +import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.network.L2GameClient.GameClientState; import com.l2jmobius.gameserver.network.clientpackets.*; -import com.l2jmobius.util.Util; /** * Stateful Packet Handler
@@ -1848,7 +1848,7 @@ public final class L2GamePacketHandler implements IPacketHandler, _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client); final byte[] array = new byte[size]; buf.get(array); - _log.warning(Util.printData(array, size)); + _log.warning(CommonUtil.printData(array, size)); } private void printDebugDoubleOpcode(int opcode, int id2, ByteBuffer buf, GameClientState state, L2GameClient client) @@ -1863,7 +1863,7 @@ public final class L2GamePacketHandler implements IPacketHandler, _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client); final byte[] array = new byte[size]; buf.get(array); - _log.warning(Util.printData(array, size)); + _log.warning(CommonUtil.printData(array, size)); } // impl diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 8438b1d894..705fe6560e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2SummonAI; @@ -54,7 +55,6 @@ import com.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; -import com.l2jmobius.util.Rnd; /** * This class manages the action use request packet. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 706782dec6..71b9daa520 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -17,6 +17,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.enums.PrivateStoreType; import com.l2jmobius.gameserver.model.Elementals; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -28,7 +29,6 @@ import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.util.Util; -import com.l2jmobius.util.Rnd; public class RequestExEnchantItemAttribute extends L2GameClientPacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 80cc16a6a0..298ea640d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -21,6 +21,7 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder; @@ -36,7 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail; import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillResult; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; -import com.l2jmobius.util.Rnd; /** * Format (ch) dd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill lvl diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index 9dae451bbb..6c92f3a7e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -21,6 +21,7 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder; @@ -36,7 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail; import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillResult; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; -import com.l2jmobius.util.Rnd; /** * Format (ch) dd c: (id) 0xD0 h: (subid) 0x34 d: skill id d: skill lvl diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java index 26835decac..be6f2f2bc3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java @@ -21,6 +21,7 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder; @@ -36,7 +37,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail; import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillResult; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; -import com.l2jmobius.util.Rnd; /** * Format (ch) dd c: (id) 0xD0 h: (subid) 0x32 d: skill id d: skill lvl diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java index 2f9523bb1f..1c7e254839 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.gameserverpackets; import java.util.List; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; public class AuthRequest extends BaseSendablePacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java index f6e4895101..9f2cd2e545 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; import javax.crypto.Cipher; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java index 8129587d7e..1fbe0a30d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java index 5f7c92f921..533ffed90c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java index b529c8873e..586bcd62b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; +import com.l2jmobius.commons.network.BaseSendablePacket; import com.l2jmobius.gameserver.LoginServerThread.SessionKey; -import com.l2jmobius.util.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java index 03f1fcef30..4c0c3b8b19 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.gameserverpackets; import java.util.List; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java index 331ec2eef3..b8cbb27e9d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java index 33deef19f6..e8cd3faedd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author mrTJO diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java index 0e3159aead..598478217c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.gameserverpackets; import java.util.List; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author mrTJO Thanks to mochitto diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java index 8a8938511b..adfab32113 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author mrTJO diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java index 5e76b7c1cc..8c9292367d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.gameserverpackets; import java.util.ArrayList; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java index 8d2a02b974..8a03e48834 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.gameserverpackets; -import com.l2jmobius.util.network.BaseSendablePacket; +import com.l2jmobius.commons.network.BaseSendablePacket; /** * @author mrTJO diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java index 84f4ec9ff8..a739773954 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java index a10d2cc715..77f2db4296 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java @@ -16,9 +16,9 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; +import com.l2jmobius.commons.network.BaseRecievePacket; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.util.network.BaseRecievePacket; public class ChangePasswordResponse extends BaseRecievePacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java index 13216f3669..c6dff4c41f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; public class InitLS extends BaseRecievePacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java index 89879c8190..76a56205e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; public class KickPlayer extends BaseRecievePacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java index 624a5e3fc8..d187f779d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; public class LoginServerFail extends BaseRecievePacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java index 923425b055..8b2920ad2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java index 403b52b1cf..ef0588131e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.network.loginserverpackets; -import com.l2jmobius.util.network.BaseRecievePacket; +import com.l2jmobius.commons.network.BaseRecievePacket; /** * @author mrTJO Thanks to mochitto diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java index 3298592d24..e2d84c5f8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/GMAudit.java @@ -48,8 +48,8 @@ public class GMAudit { final SimpleDateFormat _formatter = new SimpleDateFormat("dd/MM/yyyy H:mm:ss"); final String date = _formatter.format(new Date()); - String name = com.l2jmobius.util.Util.replaceIllegalCharacters(gmName); - if (!com.l2jmobius.util.Util.isValidFileName(name)) + String name = com.l2jmobius.commons.util.CommonUtil.replaceIllegalCharacters(gmName); + if (!com.l2jmobius.commons.util.CommonUtil.isValidFileName(name)) { name = "INVALID_GM_NAME_" + date; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java index 643cb3f930..ae0fe74350 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java @@ -21,13 +21,13 @@ import java.util.concurrent.CopyOnWriteArrayList; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.holders.MinionHolder; -import com.l2jmobius.util.Rnd; /** * @author luisantonioa, DS, Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java index d17fca322c..8c85076d9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java @@ -31,6 +31,7 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.concurrent.ThreadPool; +import com.l2jmobius.commons.util.file.filter.ExtFilter; import com.l2jmobius.gameserver.enums.HtmlActionScope; import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import com.l2jmobius.gameserver.geoengine.GeoEngine; @@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.model.interfaces.ILocational; import com.l2jmobius.gameserver.network.serverpackets.AbstractHtmlPacket; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.ShowBoard; -import com.l2jmobius.util.file.filter.ExtFilter; /** * General Utility functions related to game server. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/L2LogManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/L2LogManager.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/L2LogManager.java rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/L2LogManager.java index e5b9c7201b..ee7bfbd213 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/L2LogManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/L2LogManager.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 com.l2jmobius.util; +package com.l2jmobius.log; import java.util.logging.LogManager; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java index 4c6df871f9..fb63c084cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/ConsoleLogFormatter.java @@ -19,7 +19,7 @@ package com.l2jmobius.log.formatter; import java.util.logging.LogRecord; import com.l2jmobius.Config; -import com.l2jmobius.util.Util; +import com.l2jmobius.commons.util.CommonUtil; public class ConsoleLogFormatter extends AbstractFormatter { @@ -34,7 +34,7 @@ public class ConsoleLogFormatter extends AbstractFormatter { try { - output.append(Util.getStackTrace(record.getThrown())); + output.append(CommonUtil.getStackTrace(record.getThrown())); output.append(Config.EOL); } catch (Exception ex) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java index c611bcc4dd..800850c93b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java @@ -34,10 +34,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.IPSubnet; +import com.l2jmobius.commons.util.IXmlReader; +import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; -import com.l2jmobius.util.IPSubnet; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.data.xml.IXmlReader; /** * The Class GameServerTable loads the game server names and initialize the game server tables. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java index 3559130282..cd346cde97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerThread.java @@ -28,6 +28,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; +import com.l2jmobius.commons.network.BaseSendablePacket; +import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState; @@ -36,8 +38,6 @@ import com.l2jmobius.loginserver.network.loginserverpackets.InitLS; import com.l2jmobius.loginserver.network.loginserverpackets.KickPlayer; import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; import com.l2jmobius.loginserver.network.loginserverpackets.RequestCharacters; -import com.l2jmobius.util.crypt.NewCrypt; -import com.l2jmobius.util.network.BaseSendablePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java index ec87387756..58b26830c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java @@ -41,13 +41,13 @@ import javax.crypto.Cipher; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.util.Rnd; +import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.model.data.AccountInfo; import com.l2jmobius.loginserver.network.L2LoginClient; import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.crypt.ScrambledKeyPair; public class LoginController { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/SelectorHelper.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/SelectorHelper.java index 96e1875ed7..c0150d7b9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/SelectorHelper.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/SelectorHelper.java @@ -29,7 +29,7 @@ import com.l2jmobius.commons.mmocore.MMOConnection; import com.l2jmobius.commons.mmocore.ReceivablePacket; import com.l2jmobius.loginserver.network.L2LoginClient; import com.l2jmobius.loginserver.network.serverpackets.Init; -import com.l2jmobius.util.IPv4Filter; +import com.l2jmobius.loginserver.network.util.IPv4Filter; /** * @author KenM diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java index cb8982960f..ee23a9c6cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java @@ -18,6 +18,7 @@ package com.l2jmobius.loginserver.network; import java.util.logging.Logger; +import com.l2jmobius.commons.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey; import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel; @@ -31,7 +32,6 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ReplyCharacters; import com.l2jmobius.loginserver.network.gameserverpackets.RequestTempBan; import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus; import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; -import com.l2jmobius.util.network.BaseRecievePacket; /** * @author mrTJO diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java index 16271c2336..e7d0f6990e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/L2LoginClient.java @@ -27,6 +27,9 @@ import java.util.logging.Logger; import com.l2jmobius.commons.mmocore.MMOClient; import com.l2jmobius.commons.mmocore.MMOConnection; import com.l2jmobius.commons.mmocore.SendablePacket; +import com.l2jmobius.commons.util.Rnd; +import com.l2jmobius.commons.util.crypt.LoginCrypt; +import com.l2jmobius.commons.util.crypt.ScrambledKeyPair; import com.l2jmobius.loginserver.LoginController; import com.l2jmobius.loginserver.SessionKey; import com.l2jmobius.loginserver.network.serverpackets.L2LoginServerPacket; @@ -34,9 +37,6 @@ import com.l2jmobius.loginserver.network.serverpackets.LoginFail; import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason; import com.l2jmobius.loginserver.network.serverpackets.PlayFail; import com.l2jmobius.loginserver.network.serverpackets.PlayFail.PlayFailReason; -import com.l2jmobius.util.Rnd; -import com.l2jmobius.util.crypt.LoginCrypt; -import com.l2jmobius.util.crypt.ScrambledKeyPair; /** * Represents a client connected into the LoginServer diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java index 113796e392..2d97271178 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java @@ -22,10 +22,10 @@ import java.util.logging.Logger; import javax.crypto.Cipher; +import com.l2jmobius.commons.network.BaseRecievePacket; +import com.l2jmobius.commons.util.crypt.NewCrypt; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState; -import com.l2jmobius.util.crypt.NewCrypt; -import com.l2jmobius.util.network.BaseRecievePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java index 45060a1e06..aaee954e11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java @@ -18,9 +18,9 @@ package com.l2jmobius.loginserver.network.gameserverpackets; import java.util.logging.Logger; +import com.l2jmobius.commons.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.LoginController; -import com.l2jmobius.util.network.BaseRecievePacket; /** * @author -Wooden- diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java index c58e62c9bb..df8ecaecae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java @@ -26,10 +26,10 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.database.DatabaseFactory; +import com.l2jmobius.commons.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.GameServerThread; -import com.l2jmobius.util.network.BaseRecievePacket; /** * @author Nik diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java index 8fcfbbaf81..b6c99d08be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java @@ -20,13 +20,13 @@ import java.util.Arrays; import java.util.logging.Logger; import com.l2jmobius.Config; +import com.l2jmobius.commons.network.BaseRecievePacket; import com.l2jmobius.loginserver.GameServerTable; import com.l2jmobius.loginserver.GameServerTable.GameServerInfo; import com.l2jmobius.loginserver.GameServerThread; import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState; import com.l2jmobius.loginserver.network.loginserverpackets.AuthResponse; import com.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail; -import com.l2jmobius.util.network.BaseRecievePacket; /** * 
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index b6946c6814..6bd39338cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,11 +16,11 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
 import com.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index ecc9773c8c..cbb0e9fdd6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,8 +16,8 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index f6be172fcd..5ed2e7c402 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,8 +18,8 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 062d65efee..a953fbf9ed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,8 +18,8 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 0c224403d7..8ee1616a7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,9 +16,9 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * Thanks to mochitto.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 9eeac7dc97..20c9c912b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,8 +23,8 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index 0506873a6b..75d1d1c8ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,10 +18,10 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
-import com.l2jmobius.util.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index d1beca5a76..bc470ee8fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,8 +16,8 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
-import com.l2jmobius.util.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 61feae1014..ca10388fde 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 1889dfe447..2e22616e3e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,8 +16,8 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
-import com.l2jmobius.util.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index 063096e9da..c95912ec69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 9306d5cbad..bf1d553b13 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 3e51102915..ddb6913a1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 568a0e0cfd..06b1c177e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPv4Filter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPv4Filter.java
rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.java
index cdcb28dc04..a66843032b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPv4Filter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/util/IPv4Filter.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 com.l2jmobius.util;
+package com.l2jmobius.loginserver.network.util;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/status/Status.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/status/Status.java
index e76b16fd0c..5d0fa93eaa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/status/Status.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/status/Status.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.Server;
-import com.l2jmobius.util.Rnd;
+import com.l2jmobius.commons.util.Rnd;
 
 public class Status extends Thread
 {
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/ScriptExecutor.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/ScriptExecutor.java
index 2df7e080e5..ca69b9994f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/ScriptExecutor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/util/mysql/ScriptExecutor.java
@@ -27,8 +27,8 @@ import java.util.Scanner;
 
 import javax.swing.JOptionPane;
 
+import com.l2jmobius.commons.util.file.filter.SQLFilter;
 import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.util.file.filter.SQLFilter;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 743bed639f..715ee05d47 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -26,6 +26,7 @@ import java.nio.channels.FileChannel;
 import java.util.Scanner;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.gameserver.geoengine.geodata.ABlock;
 import com.l2jmobius.gameserver.geoengine.geodata.BlockComplex;
 import com.l2jmobius.gameserver.geoengine.geodata.BlockFlat;
@@ -33,7 +34,6 @@ import com.l2jmobius.gameserver.geoengine.geodata.BlockMultilayer;
 import com.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
 import com.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
 import com.l2jmobius.gameserver.model.L2World;
-import com.l2jmobius.util.PropertiesParser;
 
 /**
  * @author Hasha
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index e0a9aa2df9..5121209f83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -32,8 +32,8 @@ import java.util.ResourceBundle;
 import com.l2jmobius.Config;
 import com.l2jmobius.Server;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.loginserver.GameServerTable;
-import com.l2jmobius.util.Util;
 
 /**
  * The Class BaseGameServerRegister.
@@ -128,7 +128,7 @@ public abstract class BaseGameServerRegister
 	 */
 	public static void registerGameServer(int id, String outDir) throws IOException
 	{
-		final byte[] hexId = Util.generateHex(16);
+		final byte[] hexId = CommonUtil.generateHex(16);
 		GameServerTable.getInstance().registerServerOnDB(hexId, id, "");
 		
 		final Properties hexSetting = new Properties();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/OldPledgeFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/OldPledgeFilter.java
deleted file mode 100644
index 28f0a23be3..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/file/filter/OldPledgeFilter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.util.file.filter;
-
-import java.io.File;
-import java.io.FileFilter;
-
-/**
- * Specialized {@link FileFilter} class.

- * Accepts files starting with "Pledge_" only.
- * @author Zoey76
- */
-public class OldPledgeFilter implements FileFilter
-{
-	@Override
-	public boolean accept(File f)
-	{
-		return (f != null) && f.isFile() && f.getName().startsWith("Pledge_");
-	}
-}
\ No newline at end of file