diff --git a/.gitignore b/.gitignore index 1050628..1d1162c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ ls.jar *.class bin build +target +*~ .* !.gitignore !.gitmodules diff --git a/GameServer/build.xml b/GameServer/build.xml deleted file mode 100644 index c4b586a..0000000 --- a/GameServer/build.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GameServer/ivy.xml b/GameServer/ivy.xml deleted file mode 100644 index 12a0ddd..0000000 --- a/GameServer/ivy.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/GameServer/lib/mina.jar b/GameServer/lib/mina.jar deleted file mode 100644 index a5fc451..0000000 Binary files a/GameServer/lib/mina.jar and /dev/null differ diff --git a/GameServer/module/DataStoreCore.jar b/GameServer/module/DataStoreCore.jar deleted file mode 100644 index bfea6ab..0000000 Binary files a/GameServer/module/DataStoreCore.jar and /dev/null differ diff --git a/GameServer/module/XMLUsingXStreamDataStore.jar b/GameServer/module/XMLUsingXStreamDataStore.jar deleted file mode 100644 index f85dcaa..0000000 Binary files a/GameServer/module/XMLUsingXStreamDataStore.jar and /dev/null differ diff --git a/GameServer/moparclassic.jar b/GameServer/moparclassic.jar deleted file mode 100644 index edc4207..0000000 Binary files a/GameServer/moparclassic.jar and /dev/null differ diff --git a/GameServer/pom.xml b/GameServer/pom.xml new file mode 100644 index 0000000..67d844d --- /dev/null +++ b/GameServer/pom.xml @@ -0,0 +1,97 @@ + + + 4.0.0 + + org.moparscape.classic + MoparClassic + 1.0-SNAPSHOT + + GameServer + jar + ${project.artifactId} + + org.moparscape.msc.gs.Server + 2.9.1 + + + + org.apache.mina + mina-core + + + javax.mail + mail + 1.4.4 + + + org.beanshell + bsh + 2.0b4 + + + commons-collections + commons-collections + 3.2.1 + + + net.jcip + jcip-annotations + 1.0 + + + org.scala-lang + scala-library + ${scala.version} + runtime + + + org.slf4j + slf4j-simple + runtime + + + mysql + mysql-connector-java + runtime + + + + + moparclassic + + + org.scala-tools + maven-scala-plugin + 2.15.2 + + + scala-compile-first + process-resources + + add-source + compile + + + + + ${scala.version} + + + + org.codehaus.mojo + exec-maven-plugin + + + maven-jar-plugin + + + maven-assembly-plugin + + + + diff --git a/GameServer/src/org/moparscape/msc/config/Config.java b/GameServer/src/main/java/org/moparscape/msc/config/Config.java similarity index 100% rename from GameServer/src/org/moparscape/msc/config/Config.java rename to GameServer/src/main/java/org/moparscape/msc/config/Config.java diff --git a/GameServer/src/org/moparscape/msc/config/Constants.java b/GameServer/src/main/java/org/moparscape/msc/config/Constants.java similarity index 100% rename from GameServer/src/org/moparscape/msc/config/Constants.java rename to GameServer/src/main/java/org/moparscape/msc/config/Constants.java diff --git a/GameServer/src/org/moparscape/msc/config/Formulae.java b/GameServer/src/main/java/org/moparscape/msc/config/Formulae.java similarity index 100% rename from GameServer/src/org/moparscape/msc/config/Formulae.java rename to GameServer/src/main/java/org/moparscape/msc/config/Formulae.java diff --git a/GameServer/src/org/moparscape/msc/gs/Instance.java b/GameServer/src/main/java/org/moparscape/msc/gs/Instance.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/Instance.java rename to GameServer/src/main/java/org/moparscape/msc/gs/Instance.java diff --git a/GameServer/src/org/moparscape/msc/gs/Server.java b/GameServer/src/main/java/org/moparscape/msc/gs/Server.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/Server.java rename to GameServer/src/main/java/org/moparscape/msc/gs/Server.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/LSPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/LSPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/LSPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/LSPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/MiscPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/MiscPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/MiscPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/MiscPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/RSCPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/RSCPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/RSCPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/RSCPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/StaticPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/StaticPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java b/GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/LSCodecFactory.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/LSCodecFactory.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/LSCodecFactory.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/LSCodecFactory.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/LSConnectionHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/LSConnectionHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/LSConnectionHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/LSConnectionHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/LSPacket.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/LSPacket.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/LSPacket.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/LSPacket.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolDecoder.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/LSProtocolDecoder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/LSProtocolDecoder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/LSProtocolDecoder.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolEncoder.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/LSProtocolEncoder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/LSProtocolEncoder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/LSProtocolEncoder.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/Packet.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/Packet.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/Packet.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/Packet.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/PacketQueue.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/PacketQueue.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/PacketQueue.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/PacketQueue.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCCodecFactory.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCCodecFactory.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/RSCCodecFactory.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCCodecFactory.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCConnectionHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCConnectionHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCPacket.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCPacket.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/RSCPacket.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCPacket.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java diff --git a/GameServer/src/org/moparscape/msc/gs/connection/filter/ConnectionFilter.java b/GameServer/src/main/java/org/moparscape/msc/gs/connection/filter/ConnectionFilter.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/filter/ConnectionFilter.java rename to GameServer/src/main/java/org/moparscape/msc/gs/connection/filter/ConnectionFilter.java diff --git a/GameServer/src/org/moparscape/msc/gs/core/ClientUpdater.java b/GameServer/src/main/java/org/moparscape/msc/gs/core/ClientUpdater.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/core/ClientUpdater.java rename to GameServer/src/main/java/org/moparscape/msc/gs/core/ClientUpdater.java diff --git a/GameServer/src/org/moparscape/msc/gs/core/DelayedEventHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/core/DelayedEventHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/core/DelayedEventHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/core/DelayedEventHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java b/GameServer/src/main/java/org/moparscape/msc/gs/core/GameEngine.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/core/GameEngine.java rename to GameServer/src/main/java/org/moparscape/msc/gs/core/GameEngine.java diff --git a/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java b/GameServer/src/main/java/org/moparscape/msc/gs/core/LoginConnector.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java rename to GameServer/src/main/java/org/moparscape/msc/gs/core/LoginConnector.java diff --git a/GameServer/src/org/moparscape/msc/gs/db/DBConnection.java b/GameServer/src/main/java/org/moparscape/msc/gs/db/DBConnection.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/db/DBConnection.java rename to GameServer/src/main/java/org/moparscape/msc/gs/db/DBConnection.java diff --git a/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java b/GameServer/src/main/java/org/moparscape/msc/gs/db/ReportHandlerQueries.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java rename to GameServer/src/main/java/org/moparscape/msc/gs/db/ReportHandlerQueries.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/DelayedEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/DelayedEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/DelayedEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/DelayedEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/DelayedQuestChat.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/DelayedQuestChat.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/DelayedQuestChat.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/DelayedQuestChat.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/DuelEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/DuelEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/DuelEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/DuelEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/FightEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/FightEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/FightEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/MiniEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/MiniEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/MiniEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/MiniEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/ObjectRemover.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/ObjectRemover.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/ObjectRemover.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/ObjectRemover.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/RangeEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/RangeEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/ShortEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/ShortEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/ShortEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/ShortEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/SingleEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/SingleEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/SingleEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/SingleEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/WalkMobToMobEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/WalkMobToMobEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/WalkToMobEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToMobEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/WalkToMobEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToMobEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/WalkToObjectEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToObjectEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/WalkToObjectEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToObjectEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/event/WalkToPointEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToPointEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/event/WalkToPointEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/event/WalkToPointEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/AgilityCourseDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/AgilityCourseDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/AgilityCourseDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/AgilityCourseDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/AgilityDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/AgilityDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/AgilityDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/AgilityDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/CertDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/CertDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/CertDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/CertDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/CerterDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/CerterDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/CerterDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/CerterDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/DoorDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/DoorDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/DoorDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/DoorDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/EntityDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/EntityDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/EntityDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/EntityDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/EntityHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/EntityHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/FiremakingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/FiremakingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/FiremakingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/FiremakingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/GameObjectDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/GameObjectDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/GameObjectDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/GameObjectDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/GameObjectLoc.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/GameObjectLoc.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/GameObjectLoc.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/GameObjectLoc.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemArrowHeadDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemArrowHeadDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemArrowHeadDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemArrowHeadDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemBowStringDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemBowStringDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemBowStringDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemBowStringDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemCookingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemCookingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemCookingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemCookingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemCraftingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemCraftingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemCraftingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemCraftingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemDartTipDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDartTipDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemDartTipDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDartTipDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemDropDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDropDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemDropDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemDropDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemGemDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemGemDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemGemDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemGemDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemHerbDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemHerbDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemHerbDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemHerbDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemHerbSecond.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemHerbSecond.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemHerbSecond.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemHerbSecond.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemLoc.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemLoc.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemLoc.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemLoc.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemLogCutDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemLogCutDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemLogCutDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemLogCutDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemSmeltingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemSmeltingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemSmeltingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemSmeltingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemSmithingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemSmithingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemSmithingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemSmithingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ItemWieldableDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ItemWieldableDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ItemWieldableDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ItemWieldableDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/NPCDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/NPCDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/NPCDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/NPCDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/NPCLoc.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/NPCLoc.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/NPCLoc.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/NPCLoc.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ObjectFishDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectFishDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ObjectFishDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectFishDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ObjectFishingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectFishingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ObjectFishingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectFishingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ObjectMiningDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectMiningDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ObjectMiningDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectMiningDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/PrayerDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/PrayerDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/PrayerDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/PrayerDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/ReqOreDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/ReqOreDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/ReqOreDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/ReqOreDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/SpellDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/SpellDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/SpellDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/SpellDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/external/TileDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/external/TileDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/external/TileDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/external/TileDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java b/GameServer/src/main/java/org/moparscape/msc/gs/io/WorldLoader.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java rename to GameServer/src/main/java/org/moparscape/msc/gs/io/WorldLoader.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/ActiveTile.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/ActiveTile.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/ActiveTile.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/ActiveTile.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Bank.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Bank.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Bank.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Bank.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Bubble.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Bubble.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Bubble.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Bubble.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/ChatMessage.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/ChatMessage.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/ChatMessage.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/ChatMessage.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Entity.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Entity.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Entity.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Entity.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/GameObject.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/GameObject.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/GameObject.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/GameObject.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/InvItem.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/InvItem.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/InvItem.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/InvItem.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Inventory.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Inventory.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Inventory.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Inventory.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Item.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Item.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Item.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Item.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/MenuHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/MenuHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/MenuHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/MenuHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Mob.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Mob.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Mob.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Mob.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Npc.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Npc.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Npc.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Npc.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Path.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Path.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Path.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Path.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/PathGenerator.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/PathGenerator.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/PathGenerator.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/PathGenerator.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/PathHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/PathHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/PathHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/PathHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Player.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Player.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Player.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Player.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/PlayerAppearance.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/PlayerAppearance.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/PlayerAppearance.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/PlayerAppearance.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Point.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Point.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Point.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Point.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Projectile.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Projectile.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Projectile.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Projectile.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Script.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Script.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Script.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Script.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Sector.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Sector.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Sector.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Sector.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Shop.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Shop.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Shop.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Shop.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Syndicate.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Syndicate.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Syndicate.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Syndicate.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/TelePoint.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/TelePoint.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/TelePoint.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/TelePoint.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/Tile.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/Tile.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/Tile.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/Tile.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/TileValue.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/TileValue.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/TileValue.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/TileValue.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/ViewArea.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/ViewArea.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/ViewArea.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/ViewArea.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/World.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/World.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/World.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/World.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/mini/Damage.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/mini/Damage.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/mini/Damage.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/mini/Damage.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/snapshot/Activity.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Activity.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/snapshot/Activity.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Activity.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/snapshot/Chatlog.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Chatlog.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/snapshot/Chatlog.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Chatlog.java diff --git a/GameServer/src/org/moparscape/msc/gs/model/snapshot/Snapshot.java b/GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Snapshot.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/model/snapshot/Snapshot.java rename to GameServer/src/main/java/org/moparscape/msc/gs/model/snapshot/Snapshot.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Aggie.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Aggie.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Aggie.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Aggie.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Apothecary.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Apothecary.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Apothecary.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Apothecary.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Bananas.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Bananas.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Bananas.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Bananas.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Bankers.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Bankers.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Bankers.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Bankers.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Boat.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Boat.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Boat.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Boat.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Certer.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Certer.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/EntranaMonks.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/EntranaMonks.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/EntranaMonks.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/EntranaMonks.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/KebabSeller.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/KebabSeller.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/KebabSeller.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/KebabSeller.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/MakeOverMage.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/MakeOverMage.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/MakeOverMage.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/MakeOverMage.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/MonkHealer.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/MonkHealer.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/MonkHealer.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/MonkHealer.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/NpcHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/NpcHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/OtherNPC.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/OtherNPC.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/ShopKeeper.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/ShopKeeper.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Tanner.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Tanner.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Tanner.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Tanner.java diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Thrander.java b/GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Thrander.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/npchandler/Thrander.java rename to GameServer/src/main/java/org/moparscape/msc/gs/npchandler/Thrander.java diff --git a/Modules/DataStore/src/org/moparscape/msc/gs/persistence/DataStore.java b/GameServer/src/main/java/org/moparscape/msc/gs/persistence/DataStore.java similarity index 100% rename from Modules/DataStore/src/org/moparscape/msc/gs/persistence/DataStore.java rename to GameServer/src/main/java/org/moparscape/msc/gs/persistence/DataStore.java diff --git a/GameServer/src/org/moparscape/msc/gs/persistence/impl/DataStoreFactory.java b/GameServer/src/main/java/org/moparscape/msc/gs/persistence/impl/DataStoreFactory.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/persistence/impl/DataStoreFactory.java rename to GameServer/src/main/java/org/moparscape/msc/gs/persistence/impl/DataStoreFactory.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/PacketHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/PacketHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/PacketHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/PacketHandlerDef.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/PacketHandlerDef.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/PlayerLogin.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/PlayerLogin.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/AttackHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/AttackHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/AttackHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/AttackHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/BankHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/BankHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/BankHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/BankHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/BotHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/BotHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/BotHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/BotHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ChatHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ChatHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/ChatHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ChatHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DropHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DropHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DuelHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DuelHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DummyPacket.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/DummyPacket.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/FollowRequest.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/FollowRequest.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/FollowRequest.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/FollowRequest.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/FriendHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/FriendHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/FriendHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/FriendHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvActionHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvActionHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/NpcCommand.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/NpcCommand.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/NpcCommand.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/NpcCommand.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ObjectAction.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ObjectAction.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PickupItem.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PickupItem.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PickupItem.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PickupItem.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/Ping.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Ping.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/Ping.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Ping.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogin.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogin.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogout.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogout.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogout.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogout.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PrayerHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PrayerHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ReportHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ReportHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/ReportHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ReportHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/SessionRequest.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/SessionRequest.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/SessionRequest.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/SessionRequest.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ShopHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ShopHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/ShopHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/ShopHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/Sleepword.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Sleepword.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/Sleepword.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Sleepword.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/SpellHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/SpellHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/StyleHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/StyleHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/StyleHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/StyleHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TradeHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TradeHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/Trap.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Trap.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/Trap.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/Trap.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TrapHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TrapHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/TrapHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/TrapHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WalkRequest.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WalkRequest.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WallObjectAction.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WallObjectAction.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WieldHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WieldHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/WieldHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/client/WieldHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/AlertHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/AlertHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/AlertHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/AlertHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/ForceLogout.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ForceLogout.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/ForceLogout.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ForceLogout.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogin.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/FriendLogin.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogin.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/FriendLogin.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogout.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/FriendLogout.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogout.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/FriendLogout.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReceivePM.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ReceivePM.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/ReceivePM.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ReceivePM.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/ai/RedDragon.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/ai/RedDragon.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/ai/RedDragon.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/ai/RedDragon.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/extras/Thieving.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/extras/Thieving.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemListener.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemListener.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/NpcListener.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/NpcListener.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/Test.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/plugs/Test.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/plugs/Test.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/plugs/Test.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/Dorics.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/Dorics.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/Dorics.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/Dorics.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/KnightsSword.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/KnightsSword.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/KnightsSword.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/KnightsSword.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/SheepShearer.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/SheepShearer.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/SheepShearer.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/SheepShearer.java diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java b/GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java rename to GameServer/src/main/java/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java diff --git a/GameServer/src/org/moparscape/msc/gs/quest/Quest.java b/GameServer/src/main/java/org/moparscape/msc/gs/quest/Quest.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/quest/Quest.java rename to GameServer/src/main/java/org/moparscape/msc/gs/quest/Quest.java diff --git a/GameServer/src/org/moparscape/msc/gs/quest/QuestAction.java b/GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestAction.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/quest/QuestAction.java rename to GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestAction.java diff --git a/GameServer/src/org/moparscape/msc/gs/quest/QuestEvent.java b/GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestEvent.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/quest/QuestEvent.java rename to GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestEvent.java diff --git a/GameServer/src/org/moparscape/msc/gs/quest/QuestEventManager.java b/GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestEventManager.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/quest/QuestEventManager.java rename to GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestEventManager.java diff --git a/GameServer/src/org/moparscape/msc/gs/quest/QuestManager.java b/GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestManager.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/quest/QuestManager.java rename to GameServer/src/main/java/org/moparscape/msc/gs/quest/QuestManager.java diff --git a/GameServer/src/org/moparscape/msc/gs/states/Action.java b/GameServer/src/main/java/org/moparscape/msc/gs/states/Action.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/states/Action.java rename to GameServer/src/main/java/org/moparscape/msc/gs/states/Action.java diff --git a/GameServer/src/org/moparscape/msc/gs/states/CombatState.java b/GameServer/src/main/java/org/moparscape/msc/gs/states/CombatState.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/states/CombatState.java rename to GameServer/src/main/java/org/moparscape/msc/gs/states/CombatState.java diff --git a/GameServer/src/org/moparscape/msc/gs/tools/Captcha.java b/GameServer/src/main/java/org/moparscape/msc/gs/tools/Captcha.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/tools/Captcha.java rename to GameServer/src/main/java/org/moparscape/msc/gs/tools/Captcha.java diff --git a/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java b/GameServer/src/main/java/org/moparscape/msc/gs/tools/DataConversions.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java rename to GameServer/src/main/java/org/moparscape/msc/gs/tools/DataConversions.java diff --git a/GameServer/src/org/moparscape/msc/gs/tools/PaintCaptcha.java b/GameServer/src/main/java/org/moparscape/msc/gs/tools/PaintCaptcha.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/tools/PaintCaptcha.java rename to GameServer/src/main/java/org/moparscape/msc/gs/tools/PaintCaptcha.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/Cache.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/Cache.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/Cache.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/Cache.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/DefCompressor.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/DefCompressor.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/DefCompressor.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/DefCompressor.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/DuelLog.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/DuelLog.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/DuelLog.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/DuelLog.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/EntityList.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/EntityList.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/EntityList.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/EntityList.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/EntityListIterator.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/EntityListIterator.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/EntityListIterator.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/EntityListIterator.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/Logger.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/Logger.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/Logger.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/Logger.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/MapGenerator.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/MapGenerator.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/MapGenerator.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/MapGenerator.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/ObjectLoader.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/ObjectLoader.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/ObjectLoader.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/ObjectLoader.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/RSA.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/RSA.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/RSA.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/RSA.java diff --git a/GameServer/src/org/moparscape/msc/gs/util/StatefulEntityCollection.java b/GameServer/src/main/java/org/moparscape/msc/gs/util/StatefulEntityCollection.java similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/StatefulEntityCollection.java rename to GameServer/src/main/java/org/moparscape/msc/gs/util/StatefulEntityCollection.java diff --git a/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala b/GameServer/src/main/scala/org/moparscape/msc/gs/alert/AlertHandler.scala similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala rename to GameServer/src/main/scala/org/moparscape/msc/gs/alert/AlertHandler.scala diff --git a/GameServer/src/org/moparscape/msc/gs/connection/filter/IPBanManager.scala b/GameServer/src/main/scala/org/moparscape/msc/gs/connection/filter/IPBanManager.scala similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/connection/filter/IPBanManager.scala rename to GameServer/src/main/scala/org/moparscape/msc/gs/connection/filter/IPBanManager.scala diff --git a/GameServer/src/org/moparscape/msc/gs/db/DataRequestHandler.scala b/GameServer/src/main/scala/org/moparscape/msc/gs/db/DataRequestHandler.scala similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/db/DataRequestHandler.scala rename to GameServer/src/main/scala/org/moparscape/msc/gs/db/DataRequestHandler.scala diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala b/GameServer/src/main/scala/org/moparscape/msc/gs/phandler/client/CommandHandler.scala similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala rename to GameServer/src/main/scala/org/moparscape/msc/gs/phandler/client/CommandHandler.scala diff --git a/GameServer/src/org/moparscape/msc/gs/util/HexString.scala b/GameServer/src/main/scala/org/moparscape/msc/gs/util/HexString.scala similarity index 100% rename from GameServer/src/org/moparscape/msc/gs/util/HexString.scala rename to GameServer/src/main/scala/org/moparscape/msc/gs/util/HexString.scala diff --git a/LoginServer/build.xml b/LoginServer/build.xml deleted file mode 100644 index 7bfe7e3..0000000 --- a/LoginServer/build.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LoginServer/lib/hex-string.jar b/LoginServer/lib/hex-string.jar deleted file mode 100644 index 477c6cc..0000000 Binary files a/LoginServer/lib/hex-string.jar and /dev/null differ diff --git a/LoginServer/lib/mina.jar b/LoginServer/lib/mina.jar deleted file mode 100644 index a5fc451..0000000 Binary files a/LoginServer/lib/mina.jar and /dev/null differ diff --git a/LoginServer/lib/mysql-connector.jar b/LoginServer/lib/mysql-connector.jar deleted file mode 100644 index 4741577..0000000 Binary files a/LoginServer/lib/mysql-connector.jar and /dev/null differ diff --git a/LoginServer/lib/slf4j.jar b/LoginServer/lib/slf4j.jar deleted file mode 100644 index c78cb25..0000000 Binary files a/LoginServer/lib/slf4j.jar and /dev/null differ diff --git a/LoginServer/lib/xpp3.jar b/LoginServer/lib/xpp3.jar deleted file mode 100644 index 780b574..0000000 Binary files a/LoginServer/lib/xpp3.jar and /dev/null differ diff --git a/LoginServer/lib/xstream.jar b/LoginServer/lib/xstream.jar deleted file mode 100644 index 3eabb85..0000000 Binary files a/LoginServer/lib/xstream.jar and /dev/null differ diff --git a/LoginServer/pom.xml b/LoginServer/pom.xml new file mode 100644 index 0000000..b2365ad --- /dev/null +++ b/LoginServer/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + org.moparscape.classic + MoparClassic + 1.0-SNAPSHOT + + LoginServer + jar + ${project.artifactId} + + org.moparscape.msc.ls.Server + + + + org.apache.mina + mina-core + + + com.thoughtworks.xstream + xstream + + + org.slf4j + slf4j-simple + runtime + + + mysql + mysql-connector-java + runtime + + + + ls + + + org.codehaus.mojo + exec-maven-plugin + + + maven-jar-plugin + + + maven-assembly-plugin + + + + diff --git a/LoginServer/src/org/moparscape/msc/ls/LoginEngine.java b/LoginServer/src/main/java/org/moparscape/msc/ls/LoginEngine.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/LoginEngine.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/LoginEngine.java diff --git a/LoginServer/src/org/moparscape/msc/ls/Server.java b/LoginServer/src/main/java/org/moparscape/msc/ls/Server.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/Server.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/Server.java diff --git a/LoginServer/src/org/moparscape/msc/ls/auth/Auth.java b/LoginServer/src/main/java/org/moparscape/msc/ls/auth/Auth.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/auth/Auth.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/auth/Auth.java diff --git a/LoginServer/src/org/moparscape/msc/ls/auth/impl/AuthFactory.java b/LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/AuthFactory.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/auth/impl/AuthFactory.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/AuthFactory.java diff --git a/LoginServer/src/org/moparscape/msc/ls/auth/impl/DummyAuth.java b/LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/DummyAuth.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/auth/impl/DummyAuth.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/DummyAuth.java diff --git a/LoginServer/src/org/moparscape/msc/ls/auth/impl/PersistenceAuth.java b/LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/PersistenceAuth.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/auth/impl/PersistenceAuth.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/PersistenceAuth.java diff --git a/LoginServer/src/org/moparscape/msc/ls/auth/impl/WebsiteAuth.java b/LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/WebsiteAuth.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/auth/impl/WebsiteAuth.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/auth/impl/WebsiteAuth.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/FCodecFactory.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/FCodecFactory.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/FCodecFactory.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/FCodecFactory.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolDecoder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/FProtocolDecoder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/FProtocolDecoder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/FProtocolDecoder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolEncoder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/FProtocolEncoder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/FProtocolEncoder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/FProtocolEncoder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/LSCodecFactory.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSCodecFactory.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/LSCodecFactory.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSCodecFactory.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolDecoder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSProtocolDecoder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolDecoder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSProtocolDecoder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolEncoder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSProtocolEncoder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolEncoder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/codec/LSProtocolEncoder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/model/BankItem.java b/LoginServer/src/main/java/org/moparscape/msc/ls/model/BankItem.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/model/BankItem.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/model/BankItem.java diff --git a/LoginServer/src/org/moparscape/msc/ls/model/InvItem.java b/LoginServer/src/main/java/org/moparscape/msc/ls/model/InvItem.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/model/InvItem.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/model/InvItem.java diff --git a/LoginServer/src/org/moparscape/msc/ls/model/Item.java b/LoginServer/src/main/java/org/moparscape/msc/ls/model/Item.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/model/Item.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/model/Item.java diff --git a/LoginServer/src/org/moparscape/msc/ls/model/PlayerSave.java b/LoginServer/src/main/java/org/moparscape/msc/ls/model/PlayerSave.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/model/PlayerSave.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/model/PlayerSave.java diff --git a/LoginServer/src/org/moparscape/msc/ls/model/World.java b/LoginServer/src/main/java/org/moparscape/msc/ls/model/World.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/model/World.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/model/World.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/DatabaseConnection.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/DatabaseConnection.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/DatabaseConnection.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/DatabaseConnection.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/FConnectionHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/FConnectionHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/FConnectionHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/FConnectionHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/FPacket.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/FPacket.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/FPacket.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/FPacket.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/LSConnectionHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/LSConnectionHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/LSConnectionHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/LSConnectionHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/LSPacket.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/LSPacket.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/LSPacket.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/LSPacket.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/Packet.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/Packet.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/Packet.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/Packet.java diff --git a/LoginServer/src/org/moparscape/msc/ls/net/PacketQueue.java b/LoginServer/src/main/java/org/moparscape/msc/ls/net/PacketQueue.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/net/PacketQueue.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/net/PacketQueue.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/PacketHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/PacketHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Alert.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Alert.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Alert.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Alert.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Global.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Global.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Global.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Global.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Logout.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Logout.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Logout.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Logout.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Update.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Update.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Update.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/frontend/Update.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java diff --git a/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java b/LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/StorageMedium.java b/LoginServer/src/main/java/org/moparscape/msc/ls/persistence/StorageMedium.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/persistence/StorageMedium.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/persistence/StorageMedium.java diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java b/LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/DummyStorageMedium.java diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java b/LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/MySQL.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/persistence/impl/MySQL.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/MySQL.java diff --git a/LoginServer/src/org/moparscape/msc/ls/persistence/impl/StorageMediumFactory.java b/LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/StorageMediumFactory.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/persistence/impl/StorageMediumFactory.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/persistence/impl/StorageMediumFactory.java diff --git a/LoginServer/src/org/moparscape/msc/ls/util/Config.java b/LoginServer/src/main/java/org/moparscape/msc/ls/util/Config.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/util/Config.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/util/Config.java diff --git a/LoginServer/src/org/moparscape/msc/ls/util/DataConversions.java b/LoginServer/src/main/java/org/moparscape/msc/ls/util/DataConversions.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/util/DataConversions.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/util/DataConversions.java diff --git a/LoginServer/src/org/moparscape/msc/ls/util/PersistenceManager.java b/LoginServer/src/main/java/org/moparscape/msc/ls/util/PersistenceManager.java similarity index 100% rename from LoginServer/src/org/moparscape/msc/ls/util/PersistenceManager.java rename to LoginServer/src/main/java/org/moparscape/msc/ls/util/PersistenceManager.java diff --git a/Modules/DataStore/BinaryUsingNIO/pom.xml b/Modules/DataStore/BinaryUsingNIO/pom.xml new file mode 100644 index 0000000..2c636a7 --- /dev/null +++ b/Modules/DataStore/BinaryUsingNIO/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + org.moparscape.classic + DataStore + 1.0-SNAPSHOT + + BinaryUsingNIO + jar + ${project.artifactId} + + BinaryUsingNIODataStore + + diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/ByteBufferUtil.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/ByteBufferUtil.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/ByteBufferUtil.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/ByteBufferUtil.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/Codec.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/Codec.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/Codec.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/Codec.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/CodecLookupService.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/CodecLookupService.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/CodecLookupService.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/CodecLookupService.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/FileLookupService.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/FileLookupService.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/FileLookupService.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/FileLookupService.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/IO.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/IO.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/IO.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/IO.java diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java b/Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java similarity index 100% rename from Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java rename to Modules/DataStore/BinaryUsingNIO/src/main/java/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java diff --git a/Modules/DataStore/DataStoreCore.jar b/Modules/DataStore/DataStoreCore.jar deleted file mode 100644 index f6cb33c..0000000 Binary files a/Modules/DataStore/DataStoreCore.jar and /dev/null differ diff --git a/Modules/DataStore/XMLUsingXStream/build.xml b/Modules/DataStore/XMLUsingXStream/build.xml deleted file mode 100644 index f99a206..0000000 --- a/Modules/DataStore/XMLUsingXStream/build.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Modules/DataStore/XMLUsingXStream/lib/xpp3.jar b/Modules/DataStore/XMLUsingXStream/lib/xpp3.jar deleted file mode 100644 index 780b574..0000000 Binary files a/Modules/DataStore/XMLUsingXStream/lib/xpp3.jar and /dev/null differ diff --git a/Modules/DataStore/XMLUsingXStream/lib/xstream.jar b/Modules/DataStore/XMLUsingXStream/lib/xstream.jar deleted file mode 100644 index 3eabb85..0000000 Binary files a/Modules/DataStore/XMLUsingXStream/lib/xstream.jar and /dev/null differ diff --git a/Modules/DataStore/XMLUsingXStream/pom.xml b/Modules/DataStore/XMLUsingXStream/pom.xml new file mode 100644 index 0000000..d0a6b78 --- /dev/null +++ b/Modules/DataStore/XMLUsingXStream/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + org.moparscape.classic + DataStore + 1.0-SNAPSHOT + + XMLUsingXStream + jar + ${project.artifactId} + + + com.thoughtworks.xstream + xstream + + + + XMLUsingXStreamDataStore + + diff --git a/Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java b/Modules/DataStore/XMLUsingXStream/src/main/java/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java similarity index 100% rename from Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java rename to Modules/DataStore/XMLUsingXStream/src/main/java/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java diff --git a/Modules/DataStore/build.xml b/Modules/DataStore/build.xml deleted file mode 100644 index 3837fa3..0000000 --- a/Modules/DataStore/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Modules/DataStore/lib/jcip-annotations-1.0.jar b/Modules/DataStore/lib/jcip-annotations-1.0.jar deleted file mode 100644 index 06e9066..0000000 Binary files a/Modules/DataStore/lib/jcip-annotations-1.0.jar and /dev/null differ diff --git a/Modules/DataStore/pom.xml b/Modules/DataStore/pom.xml new file mode 100644 index 0000000..d653750 --- /dev/null +++ b/Modules/DataStore/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + org.moparscape.classic + Modules + 1.0-SNAPSHOT + + DataStore + pom + + XMLUsingXStream + BinaryUsingNIO + + + + ${project.groupId} + GameServer + ${project.version} + + + diff --git a/Modules/pom.xml b/Modules/pom.xml new file mode 100644 index 0000000..3d98b1b --- /dev/null +++ b/Modules/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + + org.moparscape.classic + MoparClassic + 1.0-SNAPSHOT + + Modules + pom + + DataStore + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..d6df214 --- /dev/null +++ b/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + org.moparscape.classic + MoparClassic + 1.0-SNAPSHOT + pom + + GameServer + LoginServer + Modules + + + true + 2.5.1 + 1.6 + + + + + org.apache.mina + mina-core + 1.1.7 + + + com.thoughtworks.xstream + xstream + 1.4.3 + + + + org.slf4j + slf4j-simple + 1.4.3 + runtime + + + mysql + mysql-connector-java + 5.1.21 + runtime + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + ${main.class} + + + + maven-jar-plugin + 2.4 + + + + ${main.class} + + + + + + maven-assembly-plugin + 2.3 + + + + ${main.class} + + + + jar-with-dependencies + + + + + jar-with-dependencies + package + + single + + + + + + + compile + + + maven-compiler-plugin + ${maven.compiler.version} + + ${java.version} + ${java.version} + false + + + + +