From e7fd71a271f1f4fc9d8bbac0b63f8267e792d48a Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 26 Jun 2017 21:45:15 +0000 Subject: [PATCH] Followed latest geodata refactorings. --- .../scripts/ai/group_template/AltarsOfSacrifice.java | 2 +- .../data/scripts/ai/group_template/FleeMonsters.java | 2 +- .../data/scripts/ai/group_template/PlainsOfDion.java | 2 +- .../data/scripts/ai/group_template/PrimevalIsle.java | 2 +- .../scripts/ai/individual/ScarletVanHalisha.java | 2 +- .../game/data/scripts/ai/individual/Valakas.java | 2 +- .../ai/npc/ForgeOfTheGods/TarBeetleSpawn.java | 2 +- .../scripts/handlers/actionhandlers/L2NpcAction.java | 2 +- .../handlers/actionhandlers/L2PcInstanceAction.java | 2 +- .../handlers/actionhandlers/L2PetInstanceAction.java | 2 +- .../handlers/actionhandlers/L2SummonAction.java | 2 +- .../handlers/admincommandhandlers/AdminGeodata.java | 2 +- .../handlers/admincommandhandlers/AdminPathNode.java | 4 ++-- .../handlers/admincommandhandlers/AdminZones.java | 2 +- .../data/scripts/handlers/effecthandlers/Blink.java | 2 +- .../scripts/handlers/effecthandlers/EnemyCharge.java | 2 +- .../scripts/handlers/effecthandlers/Fishing.java | 2 +- .../handlers/effecthandlers/TeleportToTarget.java | 2 +- .../scripts/handlers/effecthandlers/ThrowUp.java | 2 +- .../handlers/targethandlers/AreaFriendly.java | 2 +- .../instances/CrystalCaverns/CrystalCaverns.java | 2 +- .../FinalEmperialTomb/FinalEmperialTomb.java | 2 +- .../java/com/l2jmobius/gameserver/GameServer.java | 3 ++- .../com/l2jmobius/gameserver/ai/L2AttackableAI.java | 2 +- .../com/l2jmobius/gameserver/ai/L2CharacterAI.java | 2 +- .../l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java | 2 +- .../com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SummonAI.java | 4 ++-- .../l2jmobius/gameserver/data/xml/impl/DoorData.java | 2 +- .../l2jmobius/gameserver/{ => geodata}/GeoData.java | 6 +++--- .../geodata}/geodriver/Cell.java | 2 +- .../geodata}/geodriver/GeoDriver.java | 6 +++--- .../geodata}/geodriver/IBlock.java | 2 +- .../geodata}/geodriver/IRegion.java | 2 +- .../geodata}/geodriver/blocks/ComplexBlock.java | 4 ++-- .../geodata}/geodriver/blocks/FlatBlock.java | 4 ++-- .../geodata}/geodriver/blocks/MultilayerBlock.java | 4 ++-- .../geodata}/geodriver/regions/NullRegion.java | 4 ++-- .../geodata}/geodriver/regions/Region.java | 12 ++++++------ .../{ => geodata}/pathfinding/AbstractNode.java | 2 +- .../{ => geodata}/pathfinding/AbstractNodeLoc.java | 2 +- .../{ => geodata}/pathfinding/PathFinding.java | 6 +++--- .../pathfinding/cellnodes/CellNode.java | 4 ++-- .../pathfinding/cellnodes/CellNodeBuffer.java | 2 +- .../pathfinding/cellnodes/CellPathFinding.java | 10 +++++----- .../{ => geodata}/pathfinding/cellnodes/NodeLoc.java | 8 ++++---- .../{ => geodata}/pathfinding/geonodes/GeoNode.java | 4 ++-- .../pathfinding/geonodes/GeoNodeLoc.java | 4 ++-- .../pathfinding/geonodes/GeoPathFinding.java | 12 ++++++------ .../pathfinding/utils/BinaryNodeHeap.java | 4 ++-- .../pathfinding/utils/FastNodeList.java | 4 ++-- .../java/com/l2jmobius/gameserver/model/L2Spawn.java | 2 +- .../gameserver/model/actor/L2Character.java | 6 +++--- .../l2jmobius/gameserver/model/actor/L2Summon.java | 2 +- .../l2jmobius/gameserver/model/actor/L2Tower.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/items/instance/L2ItemInstance.java | 2 +- .../com/l2jmobius/gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillChannelizer.java | 2 +- .../gameserver/model/zone/form/ZoneCuboid.java | 2 +- .../gameserver/model/zone/form/ZoneCylinder.java | 2 +- .../gameserver/model/zone/form/ZoneNPoly.java | 2 +- .../java/com/l2jmobius/gameserver/util/GeoUtils.java | 4 ++-- .../java/com/l2jmobius/gameserver/util/Util.java | 2 +- 64 files changed, 102 insertions(+), 101 deletions(-) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/GeoData.java (96%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/Cell.java (94%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/GeoDriver.java (92%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/IBlock.java (93%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/IRegion.java (93%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/blocks/ComplexBlock.java (91%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/blocks/FlatBlock.java (88%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/blocks/MultilayerBlock.java (94%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/regions/NullRegion.java (88%) rename L2J_Mobius_HighFive/java/com/l2jmobius/{commons => gameserver/geodata}/geodriver/regions/Region.java (82%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/AbstractNode.java (92%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/AbstractNodeLoc.java (91%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/PathFinding.java (92%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/cellnodes/CellNode.java (87%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/cellnodes/CellNodeBuffer.java (94%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/cellnodes/CellPathFinding.java (93%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/cellnodes/NodeLoc.java (88%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/geonodes/GeoNode.java (87%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/geonodes/GeoNodeLoc.java (88%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/geonodes/GeoPathFinding.java (93%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/utils/BinaryNodeHeap.java (89%) rename L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/{ => geodata}/pathfinding/utils/FastNodeList.java (86%) diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java index 2713f3fc88..230732a264 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java @@ -18,7 +18,7 @@ package ai.group_template; import java.util.logging.Level; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java index db196f4749..c24c4792c3 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java @@ -16,8 +16,8 @@ */ package ai.group_template; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java index 2f3d7c6c99..3c46e92d28 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java @@ -16,8 +16,8 @@ */ package ai.group_template; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java index a456ea0032..351e0d67c5 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java @@ -16,9 +16,9 @@ */ package ai.group_template; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java index 5ab00e7baa..264b5197fb 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java @@ -23,8 +23,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.Collection; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.datatables.SkillData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java index 080a737ebb..e70f998ab0 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/individual/Valakas.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.MountType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GrandBossManager; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java index ee75b5d3bf..b87d00defa 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java @@ -25,8 +25,8 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Spawn; import com.l2jmobius.gameserver.model.L2Territory; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java index e992ea0273..8faf812826 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java @@ -17,9 +17,9 @@ package handlers.actionhandlers; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java index 82ffecfdc5..a71a760691 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -16,10 +16,10 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.PrivateStoreType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java index 19ff2597a5..dfbce6a9be 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java index 1e0866d1bf..4764c1ffef 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java index 706fade680..0e95e3a556 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java @@ -18,7 +18,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java index 50b53250ce..a62074244b 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java @@ -19,10 +19,10 @@ package handlers.admincommandhandlers; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; -import com.l2jmobius.gameserver.pathfinding.PathFinding; public class AdminPathNode implements IAdminCommandHandler { diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index bd43b756ec..f82aa59aaa 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -30,8 +30,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.PlayerAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8f76f28c35..2c7eccd4c1 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java index 52aab37a40..e65d1aa31e 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.conditions.Condition; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index fc5be64e65..cf93d6fef1 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.PcCondOverride; import com.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 4f74d4e97a..a716d8cdab 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java index 821cf9a9f4..fc8393bd3a 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.conditions.Condition; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java index 6cfe2e9633..3327195ed4 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index b4001fd6e7..ca00def02b 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -23,11 +23,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.TrapAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Party; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index fbdf9f0416..a207d0e36a 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -30,10 +30,10 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.L2CommandChannel; import com.l2jmobius.gameserver.model.L2Object; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameServer.java index ea54388540..31382b7bfe 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GameServer.java @@ -84,6 +84,8 @@ import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.datatables.MerchantPriceConfigTable; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.datatables.SpawnTable; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.EffectHandler; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.AirShipManager; @@ -133,7 +135,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.olympiad.Olympiad; import com.l2jmobius.gameserver.network.L2GameClient; import com.l2jmobius.gameserver.network.L2GamePacketHandler; -import com.l2jmobius.gameserver.pathfinding.PathFinding; import com.l2jmobius.gameserver.scripting.ScriptEngineManager; import com.l2jmobius.gameserver.taskmanager.KnownListUpdateTaskManager; import com.l2jmobius.gameserver.taskmanager.TaskManager; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index d461104136..2fc00baf97 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -28,12 +28,12 @@ import java.util.concurrent.TimeUnit; import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.AISkillScope; import com.l2jmobius.gameserver.enums.AIType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.DimensionalRiftManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7487e6d61d..b6f9ad8870 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -31,9 +31,9 @@ import java.util.List; import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.ItemLocation; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index f7f2b4bd33..adddc0209e 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index d95fe89369..62ef5b5854 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index 3918aa2707..87deb0ea6c 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -23,13 +23,13 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.concurrent.Future; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; 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.gameserver.pathfinding.PathFinding; import com.l2jmobius.util.Rnd; public class L2SummonAI extends L2PlayableAI implements Runnable diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java index 114f2c89b3..b4f36afc42 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -28,12 +28,12 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; 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.gameserver.pathfinding.AbstractNodeLoc; import com.l2jmobius.util.data.xml.IXmlReader; /** diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GeoData.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/GeoData.java similarity index 96% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GeoData.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/GeoData.java index 302cc96204..cfea59c619 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/GeoData.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/GeoData.java @@ -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.gameserver; +package com.l2jmobius.gameserver.geodata; import java.nio.file.Files; import java.nio.file.Path; @@ -22,9 +22,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.commons.geodriver.Cell; -import com.l2jmobius.commons.geodriver.GeoDriver; import com.l2jmobius.gameserver.data.xml.impl.DoorData; +import com.l2jmobius.gameserver.geodata.geodriver.Cell; +import com.l2jmobius.gameserver.geodata.geodriver.GeoDriver; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/Cell.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/Cell.java similarity index 94% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/Cell.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/Cell.java index 7c7c441cac..4914b1d72e 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/Cell.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/Cell.java @@ -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.commons.geodriver; +package com.l2jmobius.gameserver.geodata.geodriver; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/GeoDriver.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/GeoDriver.java similarity index 92% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/GeoDriver.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/GeoDriver.java index cf7d6aae77..619358fd24 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/GeoDriver.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/GeoDriver.java @@ -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.commons.geodriver; +package com.l2jmobius.gameserver.geodata.geodriver; import java.io.IOException; import java.io.RandomAccessFile; @@ -23,8 +23,8 @@ import java.nio.channels.FileChannel.MapMode; import java.nio.file.Path; import java.util.concurrent.atomic.AtomicReferenceArray; -import com.l2jmobius.commons.geodriver.regions.NullRegion; -import com.l2jmobius.commons.geodriver.regions.Region; +import com.l2jmobius.gameserver.geodata.geodriver.regions.NullRegion; +import com.l2jmobius.gameserver.geodata.geodriver.regions.Region; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IBlock.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IBlock.java similarity index 93% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IBlock.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IBlock.java index 93680fdc94..21df97c40d 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IBlock.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IBlock.java @@ -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.commons.geodriver; +package com.l2jmobius.gameserver.geodata.geodriver; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IRegion.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IRegion.java similarity index 93% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IRegion.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IRegion.java index a17e6a0c5f..3eb23da03e 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/IRegion.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/IRegion.java @@ -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.commons.geodriver; +package com.l2jmobius.gameserver.geodata.geodriver; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/ComplexBlock.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/ComplexBlock.java similarity index 91% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/ComplexBlock.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/ComplexBlock.java index 068914d7f3..4d6410672e 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/ComplexBlock.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/ComplexBlock.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.commons.geodriver.blocks; +package com.l2jmobius.gameserver.geodata.geodriver.blocks; import java.nio.ByteBuffer; -import com.l2jmobius.commons.geodriver.IBlock; +import com.l2jmobius.gameserver.geodata.geodriver.IBlock; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/FlatBlock.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/FlatBlock.java similarity index 88% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/FlatBlock.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/FlatBlock.java index 5f924bc835..d5bcff094b 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/FlatBlock.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/FlatBlock.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.commons.geodriver.blocks; +package com.l2jmobius.gameserver.geodata.geodriver.blocks; import java.nio.ByteBuffer; -import com.l2jmobius.commons.geodriver.IBlock; +import com.l2jmobius.gameserver.geodata.geodriver.IBlock; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/MultilayerBlock.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/MultilayerBlock.java similarity index 94% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/MultilayerBlock.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/MultilayerBlock.java index c9e8f0b8f5..313131bd5a 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/blocks/MultilayerBlock.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/blocks/MultilayerBlock.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.commons.geodriver.blocks; +package com.l2jmobius.gameserver.geodata.geodriver.blocks; import java.nio.ByteBuffer; -import com.l2jmobius.commons.geodriver.IBlock; +import com.l2jmobius.gameserver.geodata.geodriver.IBlock; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/NullRegion.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/NullRegion.java similarity index 88% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/NullRegion.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/NullRegion.java index 97beba4ee4..60ecac873a 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/NullRegion.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/NullRegion.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.commons.geodriver.regions; +package com.l2jmobius.gameserver.geodata.geodriver.regions; -import com.l2jmobius.commons.geodriver.IRegion; +import com.l2jmobius.gameserver.geodata.geodriver.IRegion; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/Region.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/Region.java similarity index 82% rename from L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/Region.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/Region.java index 299f4691f7..d2d02481ed 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/commons/geodriver/regions/Region.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/geodriver/regions/Region.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.commons.geodriver.regions; +package com.l2jmobius.gameserver.geodata.geodriver.regions; import java.nio.ByteBuffer; -import com.l2jmobius.commons.geodriver.IBlock; -import com.l2jmobius.commons.geodriver.IRegion; -import com.l2jmobius.commons.geodriver.blocks.ComplexBlock; -import com.l2jmobius.commons.geodriver.blocks.FlatBlock; -import com.l2jmobius.commons.geodriver.blocks.MultilayerBlock; +import com.l2jmobius.gameserver.geodata.geodriver.IBlock; +import com.l2jmobius.gameserver.geodata.geodriver.IRegion; +import com.l2jmobius.gameserver.geodata.geodriver.blocks.ComplexBlock; +import com.l2jmobius.gameserver.geodata.geodriver.blocks.FlatBlock; +import com.l2jmobius.gameserver.geodata.geodriver.blocks.MultilayerBlock; /** * @author HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNode.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNode.java similarity index 92% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNode.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNode.java index 3dd1a85f2c..40f58ccba0 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNode.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNode.java @@ -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.gameserver.pathfinding; +package com.l2jmobius.gameserver.geodata.pathfinding; public abstract class AbstractNode { diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNodeLoc.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNodeLoc.java similarity index 91% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNodeLoc.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNodeLoc.java index 46a6408b84..197cb70df9 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/AbstractNodeLoc.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/AbstractNodeLoc.java @@ -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.gameserver.pathfinding; +package com.l2jmobius.gameserver.geodata.pathfinding; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/PathFinding.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/PathFinding.java similarity index 92% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/PathFinding.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/PathFinding.java index 17a05e949f..a9f3a1169a 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/PathFinding.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/PathFinding.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.pathfinding; +package com.l2jmobius.gameserver.geodata.pathfinding; import java.util.List; import com.l2jmobius.Config; +import com.l2jmobius.gameserver.geodata.pathfinding.cellnodes.CellPathFinding; +import com.l2jmobius.gameserver.geodata.pathfinding.geonodes.GeoPathFinding; import com.l2jmobius.gameserver.model.L2World; -import com.l2jmobius.gameserver.pathfinding.cellnodes.CellPathFinding; -import com.l2jmobius.gameserver.pathfinding.geonodes.GeoPathFinding; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNode.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNode.java similarity index 87% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNode.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNode.java index 025566e2e0..f903507286 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNode.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNode.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.pathfinding.cellnodes; +package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; -import com.l2jmobius.gameserver.pathfinding.AbstractNode; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; public class CellNode extends AbstractNode { diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNodeBuffer.java similarity index 94% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNodeBuffer.java index 8ec46cfd64..c4b60ab8bb 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellNodeBuffer.java @@ -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.gameserver.pathfinding.cellnodes; +package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; import java.util.LinkedList; import java.util.List; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java similarity index 93% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java index 0555054370..34aa54aeeb 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellPathFinding.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java @@ -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.gameserver.pathfinding.cellnodes; +package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; import java.util.ArrayList; import java.util.Iterator; @@ -24,13 +24,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; -import com.l2jmobius.gameserver.pathfinding.AbstractNode; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; -import com.l2jmobius.gameserver.pathfinding.PathFinding; /** * @author Sami, DS Credits to Diamond diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java similarity index 88% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java index 4f222b4683..7fd25fbc18 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.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.gameserver.pathfinding.cellnodes; +package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; -import com.l2jmobius.commons.geodriver.Cell; -import com.l2jmobius.gameserver.GeoData; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.geodriver.Cell; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; /** * @author -Nemesiss-, HorridoJoho diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNode.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNode.java similarity index 87% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNode.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNode.java index 30ca08048a..b6a75b0ad3 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNode.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNode.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.pathfinding.geonodes; +package com.l2jmobius.gameserver.geodata.pathfinding.geonodes; -import com.l2jmobius.gameserver.pathfinding.AbstractNode; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNodeLoc.java similarity index 88% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNodeLoc.java index 1c45d92624..48b965379a 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoNodeLoc.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.pathfinding.geonodes; +package com.l2jmobius.gameserver.geodata.pathfinding.geonodes; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.model.L2World; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoPathFinding.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java similarity index 93% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoPathFinding.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java index d3204e4d28..762cadbb73 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoPathFinding.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java @@ -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.gameserver.pathfinding.geonodes; +package com.l2jmobius.gameserver.geodata.pathfinding.geonodes; import java.io.File; import java.io.IOException; @@ -34,13 +34,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; +import com.l2jmobius.gameserver.geodata.pathfinding.utils.FastNodeList; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.pathfinding.AbstractNode; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; -import com.l2jmobius.gameserver.pathfinding.PathFinding; -import com.l2jmobius.gameserver.pathfinding.utils.FastNodeList; import com.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/BinaryNodeHeap.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/BinaryNodeHeap.java similarity index 89% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/BinaryNodeHeap.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/BinaryNodeHeap.java index 9e1b0c080e..665977f686 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/BinaryNodeHeap.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/BinaryNodeHeap.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver.pathfinding.utils; +package com.l2jmobius.gameserver.geodata.pathfinding.utils; -import com.l2jmobius.gameserver.pathfinding.geonodes.GeoNode; +import com.l2jmobius.gameserver.geodata.pathfinding.geonodes.GeoNode; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/FastNodeList.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/FastNodeList.java similarity index 86% rename from L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/FastNodeList.java rename to L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/FastNodeList.java index 33a17a9f47..535678abbd 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/pathfinding/utils/FastNodeList.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geodata/pathfinding/utils/FastNodeList.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.gameserver.pathfinding.utils; +package com.l2jmobius.gameserver.geodata.pathfinding.utils; import java.util.ArrayList; -import com.l2jmobius.gameserver.pathfinding.AbstractNode; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; /** * @author -Nemesiss- diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java index d3ec342303..42300084da 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -27,11 +27,11 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.sql.impl.TerritoryTable; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.NpcPersonalAIData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 5b8d6f83b4..874c0b50ef 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -50,6 +49,9 @@ import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.Team; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -145,8 +147,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.network.serverpackets.TeleportToLocation; -import com.l2jmobius.gameserver.pathfinding.AbstractNodeLoc; -import com.l2jmobius.gameserver.pathfinding.PathFinding; import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; import com.l2jmobius.gameserver.util.Util; import com.l2jmobius.util.EmptyQueue; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 4a9d0ea627..d51520e0c7 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.Team; +import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager; @@ -65,7 +66,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.RelationChanged; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.TeleportToLocation; -import com.l2jmobius.gameserver.pathfinding.PathFinding; import com.l2jmobius.gameserver.taskmanager.DecayTaskManager; import com.l2jmobius.gameserver.util.Util; import com.l2jmobius.util.Rnd; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Tower.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Tower.java index 039d4a31dd..04f94b079f 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Tower.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Tower.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.model.actor; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 87fec316e5..8547473059 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -47,7 +47,6 @@ import java.util.logging.Level; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.RecipeController; @@ -91,6 +90,7 @@ import com.l2jmobius.gameserver.enums.Sex; import com.l2jmobius.gameserver.enums.ShortcutType; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.Team; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; import com.l2jmobius.gameserver.idfactory.IdFactory; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 3ea2da8361..938d0ff73b 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData; import com.l2jmobius.gameserver.data.xml.impl.OptionData; @@ -41,6 +40,7 @@ import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import com.l2jmobius.gameserver.instancemanager.MercTicketManager; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index bc6e38a021..2071ea1b43 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -28,11 +28,11 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.MountType; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.handler.TargetHandler; import com.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index 01efd13734..a83f8a8dd1 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.datatables.SkillData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index ef4b77179d..d7b94c10a2 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Rectangle; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; import com.l2jmobius.util.Rnd; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index 6815434cfd..2469472278 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.model.zone.form; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; import com.l2jmobius.util.Rnd; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index b4618d99c9..9f58089cf3 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Polygon; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; import com.l2jmobius.util.Rnd; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/GeoUtils.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/GeoUtils.java index 8f7ce518be..9b7cc833f0 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/GeoUtils.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/GeoUtils.java @@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.util; import java.awt.Color; -import com.l2jmobius.commons.geodriver.Cell; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; +import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; diff --git a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/Util.java index f85b5a757d..4791fefae3 100644 --- a/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/util/Util.java @@ -30,10 +30,10 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.HtmlActionScope; import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;