From 9ab2d00170ad796bee9c1c6c8ee725aafb49c3ee Mon Sep 17 00:00:00 2001 From: Obique Date: Sat, 10 Feb 2018 09:58:52 -0600 Subject: [PATCH] Renamed file structure to be consistent with gradle's standards --- .gitmodules | 3 - PSWGCommon | 2 +- build.gradle | 18 +--- settings.gradle | 3 +- src/{ => main/java}/intents/BuffIntent.java | 0 src/{ => main/java}/intents/DanceIntent.java | 0 .../java}/intents/FactionIntent.java | 0 .../java}/intents/FlourishIntent.java | 0 .../java}/intents/GalacticIntent.java | 0 .../java}/intents/GrantBadgeIntent.java | 0 .../intents/GrantClickyCollectionIntent.java | 0 .../java}/intents/GroupEventIntent.java | 0 .../java}/intents/LoginEventIntent.java | 0 .../intents/NotifyPlayersPacketIntent.java | 0 .../java}/intents/PlayerEventIntent.java | 0 .../java}/intents/RequestZoneInIntent.java | 0 .../java}/intents/SkillModIntent.java | 0 src/{ => main/java}/intents/WatchIntent.java | 0 .../intents/chat/ChatAvatarRequestIntent.java | 0 .../java}/intents/chat/ChatCommandIntent.java | 0 .../intents/chat/ChatRoomUpdateIntent.java | 0 .../intents/chat/PersistentMessageIntent.java | 0 .../java}/intents/chat/SpatialChatIntent.java | 0 .../intents/chat/SystemMessageIntent.java | 0 .../intents/combat/CorpseLootedIntent.java | 0 .../combat/CreatureIncapacitatedIntent.java | 0 .../intents/combat/CreatureKilledIntent.java | 0 .../java}/intents/combat/DeathblowIntent.java | 0 .../intents/combat/DuelPlayerIntent.java | 0 .../combat/IncapacitateCreatureIntent.java | 0 .../intents/combat/KillCreatureIntent.java | 0 .../java}/intents/combat/LootItemIntent.java | 0 .../intents/connection/ForceLogoutIntent.java | 0 .../crafting/survey/SampleResourceIntent.java | 0 .../survey/StartSurveyToolIntent.java | 0 .../crafting/survey/StartSurveyingIntent.java | 0 .../intents/experience/ExperienceIntent.java | 0 .../intents/experience/GrantSkillIntent.java | 0 .../experience/LevelChangedIntent.java | 0 .../network/CloseConnectionIntent.java | 0 .../network/ConnectionClosedIntent.java | 0 .../network/ConnectionOpenedIntent.java | 0 .../intents/network/GalacticPacketIntent.java | 0 .../intents/network/InboundPacketIntent.java | 0 .../network/InboundPacketPendingIntent.java | 0 .../intents/network/OutboundPacketIntent.java | 0 .../object/ContainerTransferIntent.java | 0 .../object/CreateStaticItemIntent.java | 0 .../intents/object/DestroyObjectIntent.java | 0 .../object/ForceAwarenessUpdateIntent.java | 0 .../intents/object/MoveObjectIntent.java | 0 .../intents/object/ObjectCreatedIntent.java | 0 .../intents/object/ObjectTeleportIntent.java | 0 .../player/CreatedCharacterIntent.java | 0 .../intents/player/DeleteCharacterIntent.java | 0 .../player/PlayerTransformedIntent.java | 0 .../intents/radial/RadialRequestIntent.java | 0 .../intents/radial/RadialResponseIntent.java | 0 .../intents/radial/RadialSelectionIntent.java | 0 .../intents/server/ConfigChangedIntent.java | 0 .../server/ServerManagementIntent.java | 0 .../intents/server/ServerStatusIntent.java | 0 .../java}/intents/sui/SuiWindowIntent.java | 0 .../intents/travel/TicketPurchaseIntent.java | 0 .../java}/intents/travel/TicketUseIntent.java | 0 .../travel/TravelPointSelectionIntent.java | 0 src/main/{ => java/main}/ProjectSWG.java | 86 ++++++------------- .../resources/buildout/BuildoutArea.java | 0 .../resources/buildout/BuildoutAreaGrid.java | 0 .../resources/client_info/ServerFactory.java | 0 .../resources/collections/SWGBitSet.java | 0 .../java}/resources/collections/SWGFlag.java | 0 .../java}/resources/collections/SWGList.java | 0 .../java}/resources/collections/SWGMap.java | 0 .../java}/resources/collections/SWGSet.java | 0 .../resources/commands/CombatCommand.java | 0 .../java}/resources/commands/Command.java | 0 .../resources/commands/DefaultPriority.java | 0 .../resources/commands/ICmdCallback.java | 0 .../callbacks/AdminTeleportCallback.java | 0 .../callbacks/AttributesCmdCallback.java | 0 .../callbacks/ChangeDanceCallback.java | 0 .../callbacks/FindFriendCallback.java | 0 .../callbacks/FlourishCmdCallback.java | 0 .../commands/callbacks/GotoCmdCallback.java | 0 .../commands/callbacks/JumpCmdCallback.java | 0 .../commands/callbacks/KneelCmdCallback.java | 0 .../commands/callbacks/LogoutCmdCallback.java | 0 .../callbacks/PlayerAppearanceCallback.java | 0 .../commands/callbacks/ProneCmdCallback.java | 0 .../commands/callbacks/QaToolCmdCallback.java | 0 .../RequestBiographyCmdCallback.java | 0 .../callbacks/RequestDraftSlotsCallback.java | 0 .../callbacks/RequestWaypointCmdCallback.java | 0 .../callbacks/RevertAppearanceCallback.java | 0 .../commands/callbacks/ServerCmdCallback.java | 0 .../ServerDestroyObjectCmdCallback.java | 0 .../callbacks/SitOnObjectCmdCallback.java | 0 .../callbacks/SocialInternalCmdCallback.java | 0 .../commands/callbacks/StandCmdCallback.java | 0 .../callbacks/StartDanceCallback.java | 0 .../callbacks/TransferItemCallback.java | 0 .../callbacks/WaypointCmdCallback.java | 0 .../java}/resources/config/ConfigFile.java | 0 .../containers/AdminPermissions.java | 0 .../containers/ContainerPermissions.java | 0 .../containers/ContainerPermissionsType.java | 0 .../resources/containers/ContainerResult.java | 0 .../containers/DefaultPermissions.java | 0 .../containers/InventoryPermissions.java | 0 .../resources/containers/LootPermissions.java | 0 .../java}/resources/control/Debugging.java | 0 .../java}/resources/control/ServerStatus.java | 0 .../resources/location/InstanceLocation.java | 0 .../resources/location/InstanceType.java | 0 .../resources/network/BaselineBuilder.java | 0 .../resources/network/BaselineObject.java | 0 .../java}/resources/network/DeltaBuilder.java | 0 .../resources/network/DisconnectReason.java | 0 .../network/LittleEndianDataOutputStream.java | 0 .../java}/resources/network/ServerType.java | 0 .../java}/resources/network/UDPServer.java | 0 .../java}/resources/objects/Equipment.java | 0 .../resources/objects/GameObjectType.java | 0 .../resources/objects/GameObjectTypeMask.java | 0 .../java}/resources/objects/SWGObject.java | 0 .../resources/objects/SpecificObject.java | 0 .../resources/objects/awareness/Aware.java | 0 .../objects/awareness/AwarenessHandler.java | 0 .../awareness/DataTransformHandler.java | 0 .../objects/awareness/ObjectAware.java | 0 .../objects/awareness/SpeedCheckHandler.java | 0 .../objects/awareness/TerrainMap.java | 0 .../objects/awareness/TerrainMapChunk.java | 0 .../objects/building/BuildingObject.java | 0 .../objects/buildouts/BuildoutLoader.java | 0 .../objects/buildouts/SnapshotLoader.java | 0 .../objects/buildouts/SwgBuildoutArea.java | 0 .../objects/buildouts/SwgBuildoutRow.java | 0 .../buildouts/TerrainBuildoutLoader.java | 0 .../buildouts/TerrainSnapshotLoader.java | 0 .../resources/objects/cell/CellObject.java | 0 .../collections/ClickyCollectionItem.java | 0 .../objects/collections/CollectionItem.java | 0 .../resources/objects/creature/Buff.java | 0 .../objects/creature/CreatureDifficulty.java | 0 .../objects/creature/CreatureMood.java | 0 .../objects/creature/CreatureObject.java | 0 .../CreatureObjectClientServerNP.java | 0 .../creature/CreatureObjectSharedNP.java | 0 .../objects/creature/CreatureState.java | 0 .../resources/objects/custom/AIBehavior.java | 0 .../resources/objects/custom/AIObject.java | 0 .../objects/custom/LoiterAIObject.java | 0 .../objects/custom/PatrolAIObject.java | 0 .../resources/objects/custom/PatrolGroup.java | 0 .../objects/custom/RandomAIObject.java | 0 .../objects/custom/TurningAIObject.java | 0 .../objects/factory/FactoryObject.java | 0 .../resources/objects/group/GroupObject.java | 0 .../resources/objects/group/LootRule.java | 0 .../resources/objects/guild/GuildObject.java | 0 .../installation/InstallationObject.java | 0 .../objects/intangible/IntangibleObject.java | 0 .../ManufactureSchematicObject.java | 0 .../objects/mission/MissionObject.java | 0 .../objects/mobile/MobileObject.java | 0 .../objects/player/PlayerObject.java | 0 .../objects/player/PlayerObjectPrivate.java | 0 .../objects/player/PlayerObjectPrivateNP.java | 0 .../objects/player/PlayerObjectShared.java | 0 .../objects/player/PlayerObjectSharedNP.java | 0 .../resources/objects/quadtree/QuadTree.java | 0 .../resource/ResourceContainerObject.java | 0 .../resources/objects/ship/ShipObject.java | 0 .../resources/objects/sound/SoundObject.java | 0 .../objects/staticobject/StaticObject.java | 0 .../objects/tangible/CreditObject.java | 0 .../objects/tangible/OptionFlag.java | 0 .../objects/tangible/TangibleObject.java | 0 .../objects/waypoint/WaypointObject.java | 0 .../objects/weapon/WeaponObject.java | 0 .../resources/objects/weapon/WeaponType.java | 0 .../persistable/SWGObjectFactory.java | 0 .../java}/resources/player/AccessLevel.java | 0 .../java}/resources/player/Player.java | 0 .../java}/resources/player/PlayerEvent.java | 0 .../java}/resources/player/PlayerFlags.java | 0 .../java}/resources/player/PlayerState.java | 0 .../java}/resources/radial/Radials.java | 0 .../resources/rewards/RoadmapReward.java | 0 .../resources/server_info/BasicLogStream.java | 0 .../server_info/CachedObjectDatabase.java | 0 .../resources/server_info/ConfigWatcher.java | 0 .../resources/server_info/DataManager.java | 0 .../resources/server_info/ObjectDatabase.java | 0 .../resources/server_info/SdbLoader.java | 0 .../resources/server_info/StandardLog.java | 0 .../server_info/loader/BuildingLoader.java | 0 .../server_info/loader/npc/NpcLoader.java | 0 .../loader/npc/NpcPatrolRouteLoader.java | 0 .../server_info/loader/npc/NpcStatLoader.java | 0 .../loader/spawn/StaticSpawnLoader.java | 0 .../java}/resources/spawn/Spawner.java | 0 .../java}/resources/spawn/SpawnerType.java | 0 .../java}/resources/sui/SuiButtons.java | 0 .../java}/resources/sui/SuiInputBox.java | 0 .../java}/resources/sui/SuiListBox.java | 0 .../java}/resources/sui/SuiMessageBox.java | 0 .../java}/resources/sui/SuiTableWindow.java | 0 .../java}/resources/sui/SuiWindow.java | 0 .../java}/resources/zone/NameFilter.java | 0 src/{ => main/java}/services/CoreManager.java | 0 .../java}/services/EngineManager.java | 0 .../java}/services/ShutdownService.java | 0 .../java}/services/chat/ChatMailService.java | 0 .../java}/services/chat/ChatManager.java | 0 .../java}/services/chat/ChatMember.java | 0 .../services/chat/ChatRoomContainer.java | 0 .../java}/services/chat/ChatRoomHandler.java | 0 .../java}/services/chat/ChatRoomService.java | 0 .../collections/CollectionBadgeManager.java | 0 .../collections/CollectionService.java | 0 .../collections/ExplorationBadgeService.java | 0 .../java}/services/combat/CombatManager.java | 0 .../services/combat/CombatXpService.java | 0 .../java}/services/combat/CorpseService.java | 0 .../services/combat/DuelPlayerService.java | 0 .../java}/services/combat/LootService.java | 0 .../java}/services/commands/BuffService.java | 0 .../services/commands/CommandContainer.java | 0 .../commands/CommandCooldownHandler.java | 0 .../services/commands/CommandLauncher.java | 0 .../services/commands/CommandService.java | 0 .../commands/EntertainmentService.java | 0 .../services/commands/buff/BuffData.java | 0 .../java}/services/commands/buff/BuffMap.java | 0 .../services/crafting/CraftingManager.java | 0 .../crafting/resource/ResourceService.java | 0 .../resource/galactic/GalacticResource.java | 0 .../galactic/GalacticResourceLoader.java | 0 .../galactic/GalacticResourceSpawn.java | 0 .../galactic/GalacticResourceSpawner.java | 0 .../galactic/GalacticResourceStats.java | 0 .../resource/galactic/RawResourceType.java | 0 .../storage/GalacticResourceContainer.java | 0 .../crafting/resource/raw/RawResource.java | 0 .../resource/raw/RawResourceContainer.java | 0 .../survey/InProgressSampleManager.java | 0 .../survey/InProgressSurveyManager.java | 0 .../crafting/survey/SampleSession.java | 0 .../crafting/survey/SurveyService.java | 0 .../crafting/survey/SurveySession.java | 0 .../java}/services/dev/DeveloperService.java | 0 .../experience/ExperienceManager.java | 0 .../services/experience/ExpertiseService.java | 0 .../services/experience/SkillManager.java | 0 .../experience/SkillTemplateService.java | 0 .../services/faction/FactionService.java | 0 .../services/galaxy/ConnectionService.java | 0 .../services/galaxy/EnvironmentService.java | 0 .../services/galaxy/GalacticManager.java | 0 .../java}/services/galaxy/GameManager.java | 0 .../services/galaxy/SkillModService.java | 0 .../galaxy/terminals/TerminalService.java | 0 .../services/galaxy/travel/TravelGroup.java | 0 .../services/galaxy/travel/TravelHelper.java | 0 .../services/galaxy/travel/TravelPoint.java | 0 .../galaxy/travel/TravelPointManager.java | 0 .../services/galaxy/travel/TravelService.java | 0 .../services/group/GroupInviterData.java | 0 .../java}/services/group/GroupService.java | 0 .../java}/services/map/CityService.java | 0 .../java}/services/map/MapCategory.java | 0 .../java}/services/map/MapManager.java | 0 .../java}/services/map/MappingTemplate.java | 0 .../services/network/AdminNetworkClient.java | 0 .../network/HolocoreSessionManager.java | 0 .../java}/services/network/NetworkClient.java | 0 .../network/NetworkClientManager.java | 0 .../services/network/NetworkManager.java | 0 .../objects/ClientBuildoutService.java | 0 .../services/objects/ObjectAwareness.java | 0 .../java}/services/objects/ObjectCreator.java | 0 .../java}/services/objects/ObjectManager.java | 0 .../java}/services/objects/RadialService.java | 0 .../services/objects/StaticItemService.java | 0 .../services/objects/UniformBoxService.java | 0 .../player/CharacterCreationRestriction.java | 0 .../player/CharacterCreationService.java | 0 .../java}/services/player/LoginService.java | 0 .../java}/services/player/PlayerManager.java | 0 .../services/player/TerrainZoneInsertion.java | 0 .../java}/services/player/ZoneManager.java | 0 .../player/creation/CharacterCreation.java | 0 .../services/player/zone/ZoneRequester.java | 0 .../java}/services/spawn/NPCCreator.java | 0 .../java}/services/spawn/SpawnerService.java | 0 .../java}/services/spawn/StaticService.java | 0 .../java}/services/sui/SuiService.java | 0 .../java}/services/trade/TradeService.java | 0 .../java}/services/trade/TradeSession.java | 0 .../java}/utilities/AwarenessUtilities.java | 0 .../java}/utilities/BuildoutGenerator.java | 0 .../java}/utilities/IntentFactory.java | 0 src/{ => main/java}/utilities/MathUtils.java | 0 .../java}/utilities/ScheduledUtilities.java | 0 src/{ => main/java}/utilities/Scripts.java | 0 .../java}/utilities/SdbGenerator.java | 0 .../buildouts/BuildingListGenerator.java | 0 .../ClientdataPrinterCommands.java | 0 .../ClientdataPrinterDatatable.java | 0 .../crafting/ResourceSpawnViewer.java | 0 .../java}/utilities/namegen/RaceNameRule.java | 0 .../utilities/namegen/SWGNameGenerator.java | 0 {test => src/test/java}/main/TestAll.java | 3 +- .../test/java}/resources/TestPoint3D.java | 0 .../test/java}/resources/TestQuaternion.java | 0 .../test/java}/resources/TestResources.java | 0 .../test/java}/resources/TestWeatherType.java | 0 .../resources/collections/TestSWGBitSet.java | 0 .../resources/collections/TestSWGFlag.java | 0 .../resources/collections/TestSWGList.java | 0 .../TestLittleEndianDataOutputStream.java | 0 .../network/TestNetBufferStream.java | 0 .../java}/resources/objects/TestObjects.java | 0 .../resources/objects/TestSWGObject.java | 0 .../objects/awareness/MapCallback.java | 0 .../objects/awareness/TestAware.java | 0 .../objects/awareness/TestAwareness.java | 0 .../awareness/TestAwarenessHandler.java | 0 .../awareness/TestBuildoutObjectList.java | 0 .../awareness/TestObjectAwareness.java | 0 .../objects/awareness/TestTerrainMap.java | 0 .../awareness/TestTerrainMapChunk.java | 0 .../objects/quadtree/TestQuadTree.java | 0 .../persistable/TestMailPersistable.java | 0 .../persistable/TestPersistable.java | 0 .../persistable/TestResourcePersistable.java | 0 .../persistable/TestSWGPersistable.java | 0 .../persistable/TestSimplePersistable.java | 0 .../java}/resources/services/TestConfig.java | 0 .../test/java}/services/TestServices.java | 0 .../java}/services/crafting/TestCrafting.java | 0 .../resource/raw/TestRawResource.java | 0 .../raw/TestRawResourceContainer.java | 0 .../java}/services/galaxy/TestGalaxy.java | 0 .../galaxy/travel/TestTravelGroup.java | 0 .../galaxy/travel/TestTravelHelper.java | 0 .../java}/services/player/TestPlayer.java | 0 .../player/zone/TestZoneRequester.java | 0 .../test_resources/GenericCreatureObject.java | 0 352 files changed, 35 insertions(+), 80 deletions(-) rename src/{ => main/java}/intents/BuffIntent.java (100%) rename src/{ => main/java}/intents/DanceIntent.java (100%) rename src/{ => main/java}/intents/FactionIntent.java (100%) rename src/{ => main/java}/intents/FlourishIntent.java (100%) rename src/{ => main/java}/intents/GalacticIntent.java (100%) rename src/{ => main/java}/intents/GrantBadgeIntent.java (100%) rename src/{ => main/java}/intents/GrantClickyCollectionIntent.java (100%) rename src/{ => main/java}/intents/GroupEventIntent.java (100%) rename src/{ => main/java}/intents/LoginEventIntent.java (100%) rename src/{ => main/java}/intents/NotifyPlayersPacketIntent.java (100%) rename src/{ => main/java}/intents/PlayerEventIntent.java (100%) rename src/{ => main/java}/intents/RequestZoneInIntent.java (100%) rename src/{ => main/java}/intents/SkillModIntent.java (100%) rename src/{ => main/java}/intents/WatchIntent.java (100%) rename src/{ => main/java}/intents/chat/ChatAvatarRequestIntent.java (100%) rename src/{ => main/java}/intents/chat/ChatCommandIntent.java (100%) rename src/{ => main/java}/intents/chat/ChatRoomUpdateIntent.java (100%) rename src/{ => main/java}/intents/chat/PersistentMessageIntent.java (100%) rename src/{ => main/java}/intents/chat/SpatialChatIntent.java (100%) rename src/{ => main/java}/intents/chat/SystemMessageIntent.java (100%) rename src/{ => main/java}/intents/combat/CorpseLootedIntent.java (100%) rename src/{ => main/java}/intents/combat/CreatureIncapacitatedIntent.java (100%) rename src/{ => main/java}/intents/combat/CreatureKilledIntent.java (100%) rename src/{ => main/java}/intents/combat/DeathblowIntent.java (100%) rename src/{ => main/java}/intents/combat/DuelPlayerIntent.java (100%) rename src/{ => main/java}/intents/combat/IncapacitateCreatureIntent.java (100%) rename src/{ => main/java}/intents/combat/KillCreatureIntent.java (100%) rename src/{ => main/java}/intents/combat/LootItemIntent.java (100%) rename src/{ => main/java}/intents/connection/ForceLogoutIntent.java (100%) rename src/{ => main/java}/intents/crafting/survey/SampleResourceIntent.java (100%) rename src/{ => main/java}/intents/crafting/survey/StartSurveyToolIntent.java (100%) rename src/{ => main/java}/intents/crafting/survey/StartSurveyingIntent.java (100%) rename src/{ => main/java}/intents/experience/ExperienceIntent.java (100%) rename src/{ => main/java}/intents/experience/GrantSkillIntent.java (100%) rename src/{ => main/java}/intents/experience/LevelChangedIntent.java (100%) rename src/{ => main/java}/intents/network/CloseConnectionIntent.java (100%) rename src/{ => main/java}/intents/network/ConnectionClosedIntent.java (100%) rename src/{ => main/java}/intents/network/ConnectionOpenedIntent.java (100%) rename src/{ => main/java}/intents/network/GalacticPacketIntent.java (100%) rename src/{ => main/java}/intents/network/InboundPacketIntent.java (100%) rename src/{ => main/java}/intents/network/InboundPacketPendingIntent.java (100%) rename src/{ => main/java}/intents/network/OutboundPacketIntent.java (100%) rename src/{ => main/java}/intents/object/ContainerTransferIntent.java (100%) rename src/{ => main/java}/intents/object/CreateStaticItemIntent.java (100%) rename src/{ => main/java}/intents/object/DestroyObjectIntent.java (100%) rename src/{ => main/java}/intents/object/ForceAwarenessUpdateIntent.java (100%) rename src/{ => main/java}/intents/object/MoveObjectIntent.java (100%) rename src/{ => main/java}/intents/object/ObjectCreatedIntent.java (100%) rename src/{ => main/java}/intents/object/ObjectTeleportIntent.java (100%) rename src/{ => main/java}/intents/player/CreatedCharacterIntent.java (100%) rename src/{ => main/java}/intents/player/DeleteCharacterIntent.java (100%) rename src/{ => main/java}/intents/player/PlayerTransformedIntent.java (100%) rename src/{ => main/java}/intents/radial/RadialRequestIntent.java (100%) rename src/{ => main/java}/intents/radial/RadialResponseIntent.java (100%) rename src/{ => main/java}/intents/radial/RadialSelectionIntent.java (100%) rename src/{ => main/java}/intents/server/ConfigChangedIntent.java (100%) rename src/{ => main/java}/intents/server/ServerManagementIntent.java (100%) rename src/{ => main/java}/intents/server/ServerStatusIntent.java (100%) rename src/{ => main/java}/intents/sui/SuiWindowIntent.java (100%) rename src/{ => main/java}/intents/travel/TicketPurchaseIntent.java (100%) rename src/{ => main/java}/intents/travel/TicketUseIntent.java (100%) rename src/{ => main/java}/intents/travel/TravelPointSelectionIntent.java (100%) rename src/main/{ => java/main}/ProjectSWG.java (75%) rename src/{ => main/java}/resources/buildout/BuildoutArea.java (100%) rename src/{ => main/java}/resources/buildout/BuildoutAreaGrid.java (100%) rename src/{ => main/java}/resources/client_info/ServerFactory.java (100%) rename src/{ => main/java}/resources/collections/SWGBitSet.java (100%) rename src/{ => main/java}/resources/collections/SWGFlag.java (100%) rename src/{ => main/java}/resources/collections/SWGList.java (100%) rename src/{ => main/java}/resources/collections/SWGMap.java (100%) rename src/{ => main/java}/resources/collections/SWGSet.java (100%) rename src/{ => main/java}/resources/commands/CombatCommand.java (100%) rename src/{ => main/java}/resources/commands/Command.java (100%) rename src/{ => main/java}/resources/commands/DefaultPriority.java (100%) rename src/{ => main/java}/resources/commands/ICmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/AdminTeleportCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/AttributesCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/ChangeDanceCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/FindFriendCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/FlourishCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/GotoCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/JumpCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/KneelCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/LogoutCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/PlayerAppearanceCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/ProneCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/QaToolCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/RequestBiographyCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/RequestDraftSlotsCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/RequestWaypointCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/RevertAppearanceCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/ServerCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/ServerDestroyObjectCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/SitOnObjectCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/SocialInternalCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/StandCmdCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/StartDanceCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/TransferItemCallback.java (100%) rename src/{ => main/java}/resources/commands/callbacks/WaypointCmdCallback.java (100%) rename src/{ => main/java}/resources/config/ConfigFile.java (100%) rename src/{ => main/java}/resources/containers/AdminPermissions.java (100%) rename src/{ => main/java}/resources/containers/ContainerPermissions.java (100%) rename src/{ => main/java}/resources/containers/ContainerPermissionsType.java (100%) rename src/{ => main/java}/resources/containers/ContainerResult.java (100%) rename src/{ => main/java}/resources/containers/DefaultPermissions.java (100%) rename src/{ => main/java}/resources/containers/InventoryPermissions.java (100%) rename src/{ => main/java}/resources/containers/LootPermissions.java (100%) rename src/{ => main/java}/resources/control/Debugging.java (100%) rename src/{ => main/java}/resources/control/ServerStatus.java (100%) rename src/{ => main/java}/resources/location/InstanceLocation.java (100%) rename src/{ => main/java}/resources/location/InstanceType.java (100%) rename src/{ => main/java}/resources/network/BaselineBuilder.java (100%) rename src/{ => main/java}/resources/network/BaselineObject.java (100%) rename src/{ => main/java}/resources/network/DeltaBuilder.java (100%) rename src/{ => main/java}/resources/network/DisconnectReason.java (100%) rename src/{ => main/java}/resources/network/LittleEndianDataOutputStream.java (100%) rename src/{ => main/java}/resources/network/ServerType.java (100%) rename src/{ => main/java}/resources/network/UDPServer.java (100%) rename src/{ => main/java}/resources/objects/Equipment.java (100%) rename src/{ => main/java}/resources/objects/GameObjectType.java (100%) rename src/{ => main/java}/resources/objects/GameObjectTypeMask.java (100%) rename src/{ => main/java}/resources/objects/SWGObject.java (100%) rename src/{ => main/java}/resources/objects/SpecificObject.java (100%) rename src/{ => main/java}/resources/objects/awareness/Aware.java (100%) rename src/{ => main/java}/resources/objects/awareness/AwarenessHandler.java (100%) rename src/{ => main/java}/resources/objects/awareness/DataTransformHandler.java (100%) rename src/{ => main/java}/resources/objects/awareness/ObjectAware.java (100%) rename src/{ => main/java}/resources/objects/awareness/SpeedCheckHandler.java (100%) rename src/{ => main/java}/resources/objects/awareness/TerrainMap.java (100%) rename src/{ => main/java}/resources/objects/awareness/TerrainMapChunk.java (100%) rename src/{ => main/java}/resources/objects/building/BuildingObject.java (100%) rename src/{ => main/java}/resources/objects/buildouts/BuildoutLoader.java (100%) rename src/{ => main/java}/resources/objects/buildouts/SnapshotLoader.java (100%) rename src/{ => main/java}/resources/objects/buildouts/SwgBuildoutArea.java (100%) rename src/{ => main/java}/resources/objects/buildouts/SwgBuildoutRow.java (100%) rename src/{ => main/java}/resources/objects/buildouts/TerrainBuildoutLoader.java (100%) rename src/{ => main/java}/resources/objects/buildouts/TerrainSnapshotLoader.java (100%) rename src/{ => main/java}/resources/objects/cell/CellObject.java (100%) rename src/{ => main/java}/resources/objects/collections/ClickyCollectionItem.java (100%) rename src/{ => main/java}/resources/objects/collections/CollectionItem.java (100%) rename src/{ => main/java}/resources/objects/creature/Buff.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureDifficulty.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureMood.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureObject.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureObjectClientServerNP.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureObjectSharedNP.java (100%) rename src/{ => main/java}/resources/objects/creature/CreatureState.java (100%) rename src/{ => main/java}/resources/objects/custom/AIBehavior.java (100%) rename src/{ => main/java}/resources/objects/custom/AIObject.java (100%) rename src/{ => main/java}/resources/objects/custom/LoiterAIObject.java (100%) rename src/{ => main/java}/resources/objects/custom/PatrolAIObject.java (100%) rename src/{ => main/java}/resources/objects/custom/PatrolGroup.java (100%) rename src/{ => main/java}/resources/objects/custom/RandomAIObject.java (100%) rename src/{ => main/java}/resources/objects/custom/TurningAIObject.java (100%) rename src/{ => main/java}/resources/objects/factory/FactoryObject.java (100%) rename src/{ => main/java}/resources/objects/group/GroupObject.java (100%) rename src/{ => main/java}/resources/objects/group/LootRule.java (100%) rename src/{ => main/java}/resources/objects/guild/GuildObject.java (100%) rename src/{ => main/java}/resources/objects/installation/InstallationObject.java (100%) rename src/{ => main/java}/resources/objects/intangible/IntangibleObject.java (100%) rename src/{ => main/java}/resources/objects/manufacture/ManufactureSchematicObject.java (100%) rename src/{ => main/java}/resources/objects/mission/MissionObject.java (100%) rename src/{ => main/java}/resources/objects/mobile/MobileObject.java (100%) rename src/{ => main/java}/resources/objects/player/PlayerObject.java (100%) rename src/{ => main/java}/resources/objects/player/PlayerObjectPrivate.java (100%) rename src/{ => main/java}/resources/objects/player/PlayerObjectPrivateNP.java (100%) rename src/{ => main/java}/resources/objects/player/PlayerObjectShared.java (100%) rename src/{ => main/java}/resources/objects/player/PlayerObjectSharedNP.java (100%) rename src/{ => main/java}/resources/objects/quadtree/QuadTree.java (100%) rename src/{ => main/java}/resources/objects/resource/ResourceContainerObject.java (100%) rename src/{ => main/java}/resources/objects/ship/ShipObject.java (100%) rename src/{ => main/java}/resources/objects/sound/SoundObject.java (100%) rename src/{ => main/java}/resources/objects/staticobject/StaticObject.java (100%) rename src/{ => main/java}/resources/objects/tangible/CreditObject.java (100%) rename src/{ => main/java}/resources/objects/tangible/OptionFlag.java (100%) rename src/{ => main/java}/resources/objects/tangible/TangibleObject.java (100%) rename src/{ => main/java}/resources/objects/waypoint/WaypointObject.java (100%) rename src/{ => main/java}/resources/objects/weapon/WeaponObject.java (100%) rename src/{ => main/java}/resources/objects/weapon/WeaponType.java (100%) rename src/{ => main/java}/resources/persistable/SWGObjectFactory.java (100%) rename src/{ => main/java}/resources/player/AccessLevel.java (100%) rename src/{ => main/java}/resources/player/Player.java (100%) rename src/{ => main/java}/resources/player/PlayerEvent.java (100%) rename src/{ => main/java}/resources/player/PlayerFlags.java (100%) rename src/{ => main/java}/resources/player/PlayerState.java (100%) rename src/{ => main/java}/resources/radial/Radials.java (100%) rename src/{ => main/java}/resources/rewards/RoadmapReward.java (100%) rename src/{ => main/java}/resources/server_info/BasicLogStream.java (100%) rename src/{ => main/java}/resources/server_info/CachedObjectDatabase.java (100%) rename src/{ => main/java}/resources/server_info/ConfigWatcher.java (100%) rename src/{ => main/java}/resources/server_info/DataManager.java (100%) rename src/{ => main/java}/resources/server_info/ObjectDatabase.java (100%) rename src/{ => main/java}/resources/server_info/SdbLoader.java (100%) rename src/{ => main/java}/resources/server_info/StandardLog.java (100%) rename src/{ => main/java}/resources/server_info/loader/BuildingLoader.java (100%) rename src/{ => main/java}/resources/server_info/loader/npc/NpcLoader.java (100%) rename src/{ => main/java}/resources/server_info/loader/npc/NpcPatrolRouteLoader.java (100%) rename src/{ => main/java}/resources/server_info/loader/npc/NpcStatLoader.java (100%) rename src/{ => main/java}/resources/server_info/loader/spawn/StaticSpawnLoader.java (100%) rename src/{ => main/java}/resources/spawn/Spawner.java (100%) rename src/{ => main/java}/resources/spawn/SpawnerType.java (100%) rename src/{ => main/java}/resources/sui/SuiButtons.java (100%) rename src/{ => main/java}/resources/sui/SuiInputBox.java (100%) rename src/{ => main/java}/resources/sui/SuiListBox.java (100%) rename src/{ => main/java}/resources/sui/SuiMessageBox.java (100%) rename src/{ => main/java}/resources/sui/SuiTableWindow.java (100%) rename src/{ => main/java}/resources/sui/SuiWindow.java (100%) rename src/{ => main/java}/resources/zone/NameFilter.java (100%) rename src/{ => main/java}/services/CoreManager.java (100%) rename src/{ => main/java}/services/EngineManager.java (100%) rename src/{ => main/java}/services/ShutdownService.java (100%) rename src/{ => main/java}/services/chat/ChatMailService.java (100%) rename src/{ => main/java}/services/chat/ChatManager.java (100%) rename src/{ => main/java}/services/chat/ChatMember.java (100%) rename src/{ => main/java}/services/chat/ChatRoomContainer.java (100%) rename src/{ => main/java}/services/chat/ChatRoomHandler.java (100%) rename src/{ => main/java}/services/chat/ChatRoomService.java (100%) rename src/{ => main/java}/services/collections/CollectionBadgeManager.java (100%) rename src/{ => main/java}/services/collections/CollectionService.java (100%) rename src/{ => main/java}/services/collections/ExplorationBadgeService.java (100%) rename src/{ => main/java}/services/combat/CombatManager.java (100%) rename src/{ => main/java}/services/combat/CombatXpService.java (100%) rename src/{ => main/java}/services/combat/CorpseService.java (100%) rename src/{ => main/java}/services/combat/DuelPlayerService.java (100%) rename src/{ => main/java}/services/combat/LootService.java (100%) rename src/{ => main/java}/services/commands/BuffService.java (100%) rename src/{ => main/java}/services/commands/CommandContainer.java (100%) rename src/{ => main/java}/services/commands/CommandCooldownHandler.java (100%) rename src/{ => main/java}/services/commands/CommandLauncher.java (100%) rename src/{ => main/java}/services/commands/CommandService.java (100%) rename src/{ => main/java}/services/commands/EntertainmentService.java (100%) rename src/{ => main/java}/services/commands/buff/BuffData.java (100%) rename src/{ => main/java}/services/commands/buff/BuffMap.java (100%) rename src/{ => main/java}/services/crafting/CraftingManager.java (100%) rename src/{ => main/java}/services/crafting/resource/ResourceService.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/GalacticResource.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/GalacticResourceLoader.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/GalacticResourceSpawn.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/GalacticResourceSpawner.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/GalacticResourceStats.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/RawResourceType.java (100%) rename src/{ => main/java}/services/crafting/resource/galactic/storage/GalacticResourceContainer.java (100%) rename src/{ => main/java}/services/crafting/resource/raw/RawResource.java (100%) rename src/{ => main/java}/services/crafting/resource/raw/RawResourceContainer.java (100%) rename src/{ => main/java}/services/crafting/survey/InProgressSampleManager.java (100%) rename src/{ => main/java}/services/crafting/survey/InProgressSurveyManager.java (100%) rename src/{ => main/java}/services/crafting/survey/SampleSession.java (100%) rename src/{ => main/java}/services/crafting/survey/SurveyService.java (100%) rename src/{ => main/java}/services/crafting/survey/SurveySession.java (100%) rename src/{ => main/java}/services/dev/DeveloperService.java (100%) rename src/{ => main/java}/services/experience/ExperienceManager.java (100%) rename src/{ => main/java}/services/experience/ExpertiseService.java (100%) rename src/{ => main/java}/services/experience/SkillManager.java (100%) rename src/{ => main/java}/services/experience/SkillTemplateService.java (100%) rename src/{ => main/java}/services/faction/FactionService.java (100%) rename src/{ => main/java}/services/galaxy/ConnectionService.java (100%) rename src/{ => main/java}/services/galaxy/EnvironmentService.java (100%) rename src/{ => main/java}/services/galaxy/GalacticManager.java (100%) rename src/{ => main/java}/services/galaxy/GameManager.java (100%) rename src/{ => main/java}/services/galaxy/SkillModService.java (100%) rename src/{ => main/java}/services/galaxy/terminals/TerminalService.java (100%) rename src/{ => main/java}/services/galaxy/travel/TravelGroup.java (100%) rename src/{ => main/java}/services/galaxy/travel/TravelHelper.java (100%) rename src/{ => main/java}/services/galaxy/travel/TravelPoint.java (100%) rename src/{ => main/java}/services/galaxy/travel/TravelPointManager.java (100%) rename src/{ => main/java}/services/galaxy/travel/TravelService.java (100%) rename src/{ => main/java}/services/group/GroupInviterData.java (100%) rename src/{ => main/java}/services/group/GroupService.java (100%) rename src/{ => main/java}/services/map/CityService.java (100%) rename src/{ => main/java}/services/map/MapCategory.java (100%) rename src/{ => main/java}/services/map/MapManager.java (100%) rename src/{ => main/java}/services/map/MappingTemplate.java (100%) rename src/{ => main/java}/services/network/AdminNetworkClient.java (100%) rename src/{ => main/java}/services/network/HolocoreSessionManager.java (100%) rename src/{ => main/java}/services/network/NetworkClient.java (100%) rename src/{ => main/java}/services/network/NetworkClientManager.java (100%) rename src/{ => main/java}/services/network/NetworkManager.java (100%) rename src/{ => main/java}/services/objects/ClientBuildoutService.java (100%) rename src/{ => main/java}/services/objects/ObjectAwareness.java (100%) rename src/{ => main/java}/services/objects/ObjectCreator.java (100%) rename src/{ => main/java}/services/objects/ObjectManager.java (100%) rename src/{ => main/java}/services/objects/RadialService.java (100%) rename src/{ => main/java}/services/objects/StaticItemService.java (100%) rename src/{ => main/java}/services/objects/UniformBoxService.java (100%) rename src/{ => main/java}/services/player/CharacterCreationRestriction.java (100%) rename src/{ => main/java}/services/player/CharacterCreationService.java (100%) rename src/{ => main/java}/services/player/LoginService.java (100%) rename src/{ => main/java}/services/player/PlayerManager.java (100%) rename src/{ => main/java}/services/player/TerrainZoneInsertion.java (100%) rename src/{ => main/java}/services/player/ZoneManager.java (100%) rename src/{ => main/java}/services/player/creation/CharacterCreation.java (100%) rename src/{ => main/java}/services/player/zone/ZoneRequester.java (100%) rename src/{ => main/java}/services/spawn/NPCCreator.java (100%) rename src/{ => main/java}/services/spawn/SpawnerService.java (100%) rename src/{ => main/java}/services/spawn/StaticService.java (100%) rename src/{ => main/java}/services/sui/SuiService.java (100%) rename src/{ => main/java}/services/trade/TradeService.java (100%) rename src/{ => main/java}/services/trade/TradeSession.java (100%) rename src/{ => main/java}/utilities/AwarenessUtilities.java (100%) rename src/{ => main/java}/utilities/BuildoutGenerator.java (100%) rename src/{ => main/java}/utilities/IntentFactory.java (100%) rename src/{ => main/java}/utilities/MathUtils.java (100%) rename src/{ => main/java}/utilities/ScheduledUtilities.java (100%) rename src/{ => main/java}/utilities/Scripts.java (100%) rename src/{ => main/java}/utilities/SdbGenerator.java (100%) rename src/{ => main/java}/utilities/buildouts/BuildingListGenerator.java (100%) rename src/{ => main/java}/utilities/clientdata_printer/ClientdataPrinterCommands.java (100%) rename src/{ => main/java}/utilities/clientdata_printer/ClientdataPrinterDatatable.java (100%) rename src/{ => main/java}/utilities/crafting/ResourceSpawnViewer.java (100%) rename src/{ => main/java}/utilities/namegen/RaceNameRule.java (100%) rename src/{ => main/java}/utilities/namegen/SWGNameGenerator.java (100%) rename {test => src/test/java}/main/TestAll.java (97%) rename {test => src/test/java}/resources/TestPoint3D.java (100%) rename {test => src/test/java}/resources/TestQuaternion.java (100%) rename {test => src/test/java}/resources/TestResources.java (100%) rename {test => src/test/java}/resources/TestWeatherType.java (100%) rename {test => src/test/java}/resources/collections/TestSWGBitSet.java (100%) rename {test => src/test/java}/resources/collections/TestSWGFlag.java (100%) rename {test => src/test/java}/resources/collections/TestSWGList.java (100%) rename {test => src/test/java}/resources/network/TestLittleEndianDataOutputStream.java (100%) rename {test => src/test/java}/resources/network/TestNetBufferStream.java (100%) rename {test => src/test/java}/resources/objects/TestObjects.java (100%) rename {test => src/test/java}/resources/objects/TestSWGObject.java (100%) rename {test => src/test/java}/resources/objects/awareness/MapCallback.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestAware.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestAwareness.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestAwarenessHandler.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestBuildoutObjectList.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestObjectAwareness.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestTerrainMap.java (100%) rename {test => src/test/java}/resources/objects/awareness/TestTerrainMapChunk.java (100%) rename {test => src/test/java}/resources/objects/quadtree/TestQuadTree.java (100%) rename {test => src/test/java}/resources/persistable/TestMailPersistable.java (100%) rename {test => src/test/java}/resources/persistable/TestPersistable.java (100%) rename {test => src/test/java}/resources/persistable/TestResourcePersistable.java (100%) rename {test => src/test/java}/resources/persistable/TestSWGPersistable.java (100%) rename {test => src/test/java}/resources/persistable/TestSimplePersistable.java (100%) rename {test => src/test/java}/resources/services/TestConfig.java (100%) rename {test => src/test/java}/services/TestServices.java (100%) rename {test => src/test/java}/services/crafting/TestCrafting.java (100%) rename {test => src/test/java}/services/crafting/resource/raw/TestRawResource.java (100%) rename {test => src/test/java}/services/crafting/resource/raw/TestRawResourceContainer.java (100%) rename {test => src/test/java}/services/galaxy/TestGalaxy.java (100%) rename {test => src/test/java}/services/galaxy/travel/TestTravelGroup.java (100%) rename {test => src/test/java}/services/galaxy/travel/TestTravelHelper.java (100%) rename {test => src/test/java}/services/player/TestPlayer.java (100%) rename {test => src/test/java}/services/player/zone/TestZoneRequester.java (100%) rename {test => src/test/java}/test_resources/GenericCreatureObject.java (100%) diff --git a/.gitmodules b/.gitmodules index 2f24088cf..b809dc150 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "PSWGCommon"] path = PSWGCommon url = https://Obique@bitbucket.org/projectswg/pswgcommon.git -[submodule "PSWGCommonFX"] - path = PSWGCommonFX - url = https://Obique@bitbucket.org/projectswg/pswgcommonfx.git diff --git a/PSWGCommon b/PSWGCommon index c7b12adee..0e8213d64 160000 --- a/PSWGCommon +++ b/PSWGCommon @@ -1 +1 @@ -Subproject commit c7b12adeeab9bd5d40a330e42aea15efc65de10a +Subproject commit 0e8213d64f165358050444ae63398922877a5687 diff --git a/build.gradle b/build.gradle index b8153fb7b..5b6367d00 100644 --- a/build.gradle +++ b/build.gradle @@ -17,19 +17,6 @@ plugins { mainClassName = 'main.ProjectSWG' -sourceSets { - main { - java { - srcDirs = ['src', 'test'] - } - } - test { - java { - srcDirs = ['src', 'test'] - } - } -} - test { testLogging { events "skipped", "failed" // just good to know in terms of what failed @@ -53,13 +40,14 @@ repositories { dependencies { compile project(':PSWGCommon') - compile 'org.codehaus.groovy:groovy:3.0.0-alpha-1' - compile 'junit:junit:4.12' + compile group: 'org.codehaus.groovy', name: 'groovy', version: '3.0.0-alpha-1' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.25' compile group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '4.10.0.201712302008-r' compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.21.0.1' compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' + + testCompile 'junit:junit:4.12' } task wrapper(type: Wrapper) { diff --git a/settings.gradle b/settings.gradle index 95a19af84..0d002c766 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -include 'PSWGCommon', 'PSWGCommonFX' +rootProject.name = 'Holocore' +include 'PSWGCommon' diff --git a/src/intents/BuffIntent.java b/src/main/java/intents/BuffIntent.java similarity index 100% rename from src/intents/BuffIntent.java rename to src/main/java/intents/BuffIntent.java diff --git a/src/intents/DanceIntent.java b/src/main/java/intents/DanceIntent.java similarity index 100% rename from src/intents/DanceIntent.java rename to src/main/java/intents/DanceIntent.java diff --git a/src/intents/FactionIntent.java b/src/main/java/intents/FactionIntent.java similarity index 100% rename from src/intents/FactionIntent.java rename to src/main/java/intents/FactionIntent.java diff --git a/src/intents/FlourishIntent.java b/src/main/java/intents/FlourishIntent.java similarity index 100% rename from src/intents/FlourishIntent.java rename to src/main/java/intents/FlourishIntent.java diff --git a/src/intents/GalacticIntent.java b/src/main/java/intents/GalacticIntent.java similarity index 100% rename from src/intents/GalacticIntent.java rename to src/main/java/intents/GalacticIntent.java diff --git a/src/intents/GrantBadgeIntent.java b/src/main/java/intents/GrantBadgeIntent.java similarity index 100% rename from src/intents/GrantBadgeIntent.java rename to src/main/java/intents/GrantBadgeIntent.java diff --git a/src/intents/GrantClickyCollectionIntent.java b/src/main/java/intents/GrantClickyCollectionIntent.java similarity index 100% rename from src/intents/GrantClickyCollectionIntent.java rename to src/main/java/intents/GrantClickyCollectionIntent.java diff --git a/src/intents/GroupEventIntent.java b/src/main/java/intents/GroupEventIntent.java similarity index 100% rename from src/intents/GroupEventIntent.java rename to src/main/java/intents/GroupEventIntent.java diff --git a/src/intents/LoginEventIntent.java b/src/main/java/intents/LoginEventIntent.java similarity index 100% rename from src/intents/LoginEventIntent.java rename to src/main/java/intents/LoginEventIntent.java diff --git a/src/intents/NotifyPlayersPacketIntent.java b/src/main/java/intents/NotifyPlayersPacketIntent.java similarity index 100% rename from src/intents/NotifyPlayersPacketIntent.java rename to src/main/java/intents/NotifyPlayersPacketIntent.java diff --git a/src/intents/PlayerEventIntent.java b/src/main/java/intents/PlayerEventIntent.java similarity index 100% rename from src/intents/PlayerEventIntent.java rename to src/main/java/intents/PlayerEventIntent.java diff --git a/src/intents/RequestZoneInIntent.java b/src/main/java/intents/RequestZoneInIntent.java similarity index 100% rename from src/intents/RequestZoneInIntent.java rename to src/main/java/intents/RequestZoneInIntent.java diff --git a/src/intents/SkillModIntent.java b/src/main/java/intents/SkillModIntent.java similarity index 100% rename from src/intents/SkillModIntent.java rename to src/main/java/intents/SkillModIntent.java diff --git a/src/intents/WatchIntent.java b/src/main/java/intents/WatchIntent.java similarity index 100% rename from src/intents/WatchIntent.java rename to src/main/java/intents/WatchIntent.java diff --git a/src/intents/chat/ChatAvatarRequestIntent.java b/src/main/java/intents/chat/ChatAvatarRequestIntent.java similarity index 100% rename from src/intents/chat/ChatAvatarRequestIntent.java rename to src/main/java/intents/chat/ChatAvatarRequestIntent.java diff --git a/src/intents/chat/ChatCommandIntent.java b/src/main/java/intents/chat/ChatCommandIntent.java similarity index 100% rename from src/intents/chat/ChatCommandIntent.java rename to src/main/java/intents/chat/ChatCommandIntent.java diff --git a/src/intents/chat/ChatRoomUpdateIntent.java b/src/main/java/intents/chat/ChatRoomUpdateIntent.java similarity index 100% rename from src/intents/chat/ChatRoomUpdateIntent.java rename to src/main/java/intents/chat/ChatRoomUpdateIntent.java diff --git a/src/intents/chat/PersistentMessageIntent.java b/src/main/java/intents/chat/PersistentMessageIntent.java similarity index 100% rename from src/intents/chat/PersistentMessageIntent.java rename to src/main/java/intents/chat/PersistentMessageIntent.java diff --git a/src/intents/chat/SpatialChatIntent.java b/src/main/java/intents/chat/SpatialChatIntent.java similarity index 100% rename from src/intents/chat/SpatialChatIntent.java rename to src/main/java/intents/chat/SpatialChatIntent.java diff --git a/src/intents/chat/SystemMessageIntent.java b/src/main/java/intents/chat/SystemMessageIntent.java similarity index 100% rename from src/intents/chat/SystemMessageIntent.java rename to src/main/java/intents/chat/SystemMessageIntent.java diff --git a/src/intents/combat/CorpseLootedIntent.java b/src/main/java/intents/combat/CorpseLootedIntent.java similarity index 100% rename from src/intents/combat/CorpseLootedIntent.java rename to src/main/java/intents/combat/CorpseLootedIntent.java diff --git a/src/intents/combat/CreatureIncapacitatedIntent.java b/src/main/java/intents/combat/CreatureIncapacitatedIntent.java similarity index 100% rename from src/intents/combat/CreatureIncapacitatedIntent.java rename to src/main/java/intents/combat/CreatureIncapacitatedIntent.java diff --git a/src/intents/combat/CreatureKilledIntent.java b/src/main/java/intents/combat/CreatureKilledIntent.java similarity index 100% rename from src/intents/combat/CreatureKilledIntent.java rename to src/main/java/intents/combat/CreatureKilledIntent.java diff --git a/src/intents/combat/DeathblowIntent.java b/src/main/java/intents/combat/DeathblowIntent.java similarity index 100% rename from src/intents/combat/DeathblowIntent.java rename to src/main/java/intents/combat/DeathblowIntent.java diff --git a/src/intents/combat/DuelPlayerIntent.java b/src/main/java/intents/combat/DuelPlayerIntent.java similarity index 100% rename from src/intents/combat/DuelPlayerIntent.java rename to src/main/java/intents/combat/DuelPlayerIntent.java diff --git a/src/intents/combat/IncapacitateCreatureIntent.java b/src/main/java/intents/combat/IncapacitateCreatureIntent.java similarity index 100% rename from src/intents/combat/IncapacitateCreatureIntent.java rename to src/main/java/intents/combat/IncapacitateCreatureIntent.java diff --git a/src/intents/combat/KillCreatureIntent.java b/src/main/java/intents/combat/KillCreatureIntent.java similarity index 100% rename from src/intents/combat/KillCreatureIntent.java rename to src/main/java/intents/combat/KillCreatureIntent.java diff --git a/src/intents/combat/LootItemIntent.java b/src/main/java/intents/combat/LootItemIntent.java similarity index 100% rename from src/intents/combat/LootItemIntent.java rename to src/main/java/intents/combat/LootItemIntent.java diff --git a/src/intents/connection/ForceLogoutIntent.java b/src/main/java/intents/connection/ForceLogoutIntent.java similarity index 100% rename from src/intents/connection/ForceLogoutIntent.java rename to src/main/java/intents/connection/ForceLogoutIntent.java diff --git a/src/intents/crafting/survey/SampleResourceIntent.java b/src/main/java/intents/crafting/survey/SampleResourceIntent.java similarity index 100% rename from src/intents/crafting/survey/SampleResourceIntent.java rename to src/main/java/intents/crafting/survey/SampleResourceIntent.java diff --git a/src/intents/crafting/survey/StartSurveyToolIntent.java b/src/main/java/intents/crafting/survey/StartSurveyToolIntent.java similarity index 100% rename from src/intents/crafting/survey/StartSurveyToolIntent.java rename to src/main/java/intents/crafting/survey/StartSurveyToolIntent.java diff --git a/src/intents/crafting/survey/StartSurveyingIntent.java b/src/main/java/intents/crafting/survey/StartSurveyingIntent.java similarity index 100% rename from src/intents/crafting/survey/StartSurveyingIntent.java rename to src/main/java/intents/crafting/survey/StartSurveyingIntent.java diff --git a/src/intents/experience/ExperienceIntent.java b/src/main/java/intents/experience/ExperienceIntent.java similarity index 100% rename from src/intents/experience/ExperienceIntent.java rename to src/main/java/intents/experience/ExperienceIntent.java diff --git a/src/intents/experience/GrantSkillIntent.java b/src/main/java/intents/experience/GrantSkillIntent.java similarity index 100% rename from src/intents/experience/GrantSkillIntent.java rename to src/main/java/intents/experience/GrantSkillIntent.java diff --git a/src/intents/experience/LevelChangedIntent.java b/src/main/java/intents/experience/LevelChangedIntent.java similarity index 100% rename from src/intents/experience/LevelChangedIntent.java rename to src/main/java/intents/experience/LevelChangedIntent.java diff --git a/src/intents/network/CloseConnectionIntent.java b/src/main/java/intents/network/CloseConnectionIntent.java similarity index 100% rename from src/intents/network/CloseConnectionIntent.java rename to src/main/java/intents/network/CloseConnectionIntent.java diff --git a/src/intents/network/ConnectionClosedIntent.java b/src/main/java/intents/network/ConnectionClosedIntent.java similarity index 100% rename from src/intents/network/ConnectionClosedIntent.java rename to src/main/java/intents/network/ConnectionClosedIntent.java diff --git a/src/intents/network/ConnectionOpenedIntent.java b/src/main/java/intents/network/ConnectionOpenedIntent.java similarity index 100% rename from src/intents/network/ConnectionOpenedIntent.java rename to src/main/java/intents/network/ConnectionOpenedIntent.java diff --git a/src/intents/network/GalacticPacketIntent.java b/src/main/java/intents/network/GalacticPacketIntent.java similarity index 100% rename from src/intents/network/GalacticPacketIntent.java rename to src/main/java/intents/network/GalacticPacketIntent.java diff --git a/src/intents/network/InboundPacketIntent.java b/src/main/java/intents/network/InboundPacketIntent.java similarity index 100% rename from src/intents/network/InboundPacketIntent.java rename to src/main/java/intents/network/InboundPacketIntent.java diff --git a/src/intents/network/InboundPacketPendingIntent.java b/src/main/java/intents/network/InboundPacketPendingIntent.java similarity index 100% rename from src/intents/network/InboundPacketPendingIntent.java rename to src/main/java/intents/network/InboundPacketPendingIntent.java diff --git a/src/intents/network/OutboundPacketIntent.java b/src/main/java/intents/network/OutboundPacketIntent.java similarity index 100% rename from src/intents/network/OutboundPacketIntent.java rename to src/main/java/intents/network/OutboundPacketIntent.java diff --git a/src/intents/object/ContainerTransferIntent.java b/src/main/java/intents/object/ContainerTransferIntent.java similarity index 100% rename from src/intents/object/ContainerTransferIntent.java rename to src/main/java/intents/object/ContainerTransferIntent.java diff --git a/src/intents/object/CreateStaticItemIntent.java b/src/main/java/intents/object/CreateStaticItemIntent.java similarity index 100% rename from src/intents/object/CreateStaticItemIntent.java rename to src/main/java/intents/object/CreateStaticItemIntent.java diff --git a/src/intents/object/DestroyObjectIntent.java b/src/main/java/intents/object/DestroyObjectIntent.java similarity index 100% rename from src/intents/object/DestroyObjectIntent.java rename to src/main/java/intents/object/DestroyObjectIntent.java diff --git a/src/intents/object/ForceAwarenessUpdateIntent.java b/src/main/java/intents/object/ForceAwarenessUpdateIntent.java similarity index 100% rename from src/intents/object/ForceAwarenessUpdateIntent.java rename to src/main/java/intents/object/ForceAwarenessUpdateIntent.java diff --git a/src/intents/object/MoveObjectIntent.java b/src/main/java/intents/object/MoveObjectIntent.java similarity index 100% rename from src/intents/object/MoveObjectIntent.java rename to src/main/java/intents/object/MoveObjectIntent.java diff --git a/src/intents/object/ObjectCreatedIntent.java b/src/main/java/intents/object/ObjectCreatedIntent.java similarity index 100% rename from src/intents/object/ObjectCreatedIntent.java rename to src/main/java/intents/object/ObjectCreatedIntent.java diff --git a/src/intents/object/ObjectTeleportIntent.java b/src/main/java/intents/object/ObjectTeleportIntent.java similarity index 100% rename from src/intents/object/ObjectTeleportIntent.java rename to src/main/java/intents/object/ObjectTeleportIntent.java diff --git a/src/intents/player/CreatedCharacterIntent.java b/src/main/java/intents/player/CreatedCharacterIntent.java similarity index 100% rename from src/intents/player/CreatedCharacterIntent.java rename to src/main/java/intents/player/CreatedCharacterIntent.java diff --git a/src/intents/player/DeleteCharacterIntent.java b/src/main/java/intents/player/DeleteCharacterIntent.java similarity index 100% rename from src/intents/player/DeleteCharacterIntent.java rename to src/main/java/intents/player/DeleteCharacterIntent.java diff --git a/src/intents/player/PlayerTransformedIntent.java b/src/main/java/intents/player/PlayerTransformedIntent.java similarity index 100% rename from src/intents/player/PlayerTransformedIntent.java rename to src/main/java/intents/player/PlayerTransformedIntent.java diff --git a/src/intents/radial/RadialRequestIntent.java b/src/main/java/intents/radial/RadialRequestIntent.java similarity index 100% rename from src/intents/radial/RadialRequestIntent.java rename to src/main/java/intents/radial/RadialRequestIntent.java diff --git a/src/intents/radial/RadialResponseIntent.java b/src/main/java/intents/radial/RadialResponseIntent.java similarity index 100% rename from src/intents/radial/RadialResponseIntent.java rename to src/main/java/intents/radial/RadialResponseIntent.java diff --git a/src/intents/radial/RadialSelectionIntent.java b/src/main/java/intents/radial/RadialSelectionIntent.java similarity index 100% rename from src/intents/radial/RadialSelectionIntent.java rename to src/main/java/intents/radial/RadialSelectionIntent.java diff --git a/src/intents/server/ConfigChangedIntent.java b/src/main/java/intents/server/ConfigChangedIntent.java similarity index 100% rename from src/intents/server/ConfigChangedIntent.java rename to src/main/java/intents/server/ConfigChangedIntent.java diff --git a/src/intents/server/ServerManagementIntent.java b/src/main/java/intents/server/ServerManagementIntent.java similarity index 100% rename from src/intents/server/ServerManagementIntent.java rename to src/main/java/intents/server/ServerManagementIntent.java diff --git a/src/intents/server/ServerStatusIntent.java b/src/main/java/intents/server/ServerStatusIntent.java similarity index 100% rename from src/intents/server/ServerStatusIntent.java rename to src/main/java/intents/server/ServerStatusIntent.java diff --git a/src/intents/sui/SuiWindowIntent.java b/src/main/java/intents/sui/SuiWindowIntent.java similarity index 100% rename from src/intents/sui/SuiWindowIntent.java rename to src/main/java/intents/sui/SuiWindowIntent.java diff --git a/src/intents/travel/TicketPurchaseIntent.java b/src/main/java/intents/travel/TicketPurchaseIntent.java similarity index 100% rename from src/intents/travel/TicketPurchaseIntent.java rename to src/main/java/intents/travel/TicketPurchaseIntent.java diff --git a/src/intents/travel/TicketUseIntent.java b/src/main/java/intents/travel/TicketUseIntent.java similarity index 100% rename from src/intents/travel/TicketUseIntent.java rename to src/main/java/intents/travel/TicketUseIntent.java diff --git a/src/intents/travel/TravelPointSelectionIntent.java b/src/main/java/intents/travel/TravelPointSelectionIntent.java similarity index 100% rename from src/intents/travel/TravelPointSelectionIntent.java rename to src/main/java/intents/travel/TravelPointSelectionIntent.java diff --git a/src/main/ProjectSWG.java b/src/main/java/main/ProjectSWG.java similarity index 75% rename from src/main/ProjectSWG.java rename to src/main/java/main/ProjectSWG.java index 1aa2db00e..dfe44b104 100644 --- a/src/main/ProjectSWG.java +++ b/src/main/java/main/ProjectSWG.java @@ -1,30 +1,29 @@ /*********************************************************************************** -* Copyright (c) 2015 /// Project SWG /// www.projectswg.com * -* * -* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on * -* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. * -* Our goal is to create an emulator which will provide a server for players to * -* continue playing a game similar to the one they used to play. We are basing * -* it on the final publish of the game prior to end-game events. * -* * -* This file is part of Holocore. * -* * -* -------------------------------------------------------------------------------- * -* * -* Holocore is free software: you can redistribute it and/or modify * -* it under the terms of the GNU Affero General Public License as * -* published by the Free Software Foundation, either version 3 of the * -* License, or (at your option) any later version. * -* * -* Holocore is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU Affero General Public License for more details. * -* * -* You should have received a copy of the GNU Affero General Public License * -* along with Holocore. If not, see . * -* * -***********************************************************************************/ + * Copyright (c) 2018 /// Project SWG /// www.projectswg.com * + * * + * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on * + * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. * + * Our goal is to create an emulator which will provide a server for players to * + * continue playing a game similar to the one they used to play. We are basing * + * it on the final publish of the game prior to end-game events. * + * * + * This file is part of Holocore. * + * * + * --------------------------------------------------------------------------------* + * * + * Holocore is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * Holocore is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with Holocore. If not, see . * + ***********************************************************************************/ package main; import com.projectswg.common.concurrency.Delay; @@ -37,9 +36,6 @@ import com.projectswg.common.debug.Log.LogLevel; import com.projectswg.common.debug.log_wrapper.ConsoleLogWrapper; import com.projectswg.common.debug.log_wrapper.FileLogWrapper; import intents.server.ServerStatusIntent; -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; import resources.control.ServerStatus; import resources.server_info.DataManager; import services.CoreManager; @@ -56,7 +52,6 @@ public class ProjectSWG { private static final AtomicBoolean SHUTDOWN_HOOK = new AtomicBoolean(false); private static final AtomicReference INSTANCE = new AtomicReference<>(null); - private final Result testResult; private CoreManager manager; private boolean shutdownRequested; private ServerStatus status; @@ -93,14 +88,13 @@ public class ProjectSWG { } private static void mainThread(String [] args) { - Result testResult = verifyTestCases(); File logDirectory = new File("log"); if (!logDirectory.isDirectory() && !logDirectory.mkdir()) Log.w("Failed to make log directory!"); Log.addWrapper(new ConsoleLogWrapper(LogLevel.VERBOSE)); Log.addWrapper(new FileLogWrapper(new File("log/log.txt"))); - ProjectSWG server = new ProjectSWG(testResult); + ProjectSWG server = new ProjectSWG(); try { startupStaticClasses(); server.run(args); @@ -171,16 +165,7 @@ public class ProjectSWG { } } - private static Result verifyTestCases() { - try { - return JUnitCore.runClasses(TestAll.class); - } catch (Throwable t) { - throw new CoreException("Exception when starting test cases", t); - } - } - - private ProjectSWG(Result testResult) { - this.testResult = testResult; + private ProjectSWG() { this.manager = null; this.shutdownRequested = false; this.status = ServerStatus.OFFLINE; @@ -190,8 +175,6 @@ public class ProjectSWG { private void run(String [] args) { setupParameters(args); - if (!verifyUnitTests()) - return; create(); while (!shutdownRequested && !manager.isShutdownRequested()) { initialize(); @@ -215,21 +198,6 @@ public class ProjectSWG { new ServerStatusIntent(status).broadcast(); } - private boolean verifyUnitTests() { - if (testResult.getFailureCount() > 0) { - int passCount = testResult.getRunCount()-testResult.getFailureCount(); - int runCount = testResult.getRunCount(); - for (Failure failure : testResult.getFailures()) { - Log.e("Failed test. Class: %s Method: %s", failure.getDescription().getTestClass(), failure.getDescription().getMethodName()); - } - Log.e("Passed %d of %d unit tests in %.3fms - aborting start", passCount, runCount, testResult.getRunTime() / 1000.0); - return false; - } - int runCount = testResult.getRunCount(); - Log.i("Passed %d of %d unit tests in %.3fms", runCount, runCount, testResult.getRunTime() / 1000.0); - return true; - } - private void create() { long start = System.nanoTime(); manager = new CoreManager(adminServerPort); diff --git a/src/resources/buildout/BuildoutArea.java b/src/main/java/resources/buildout/BuildoutArea.java similarity index 100% rename from src/resources/buildout/BuildoutArea.java rename to src/main/java/resources/buildout/BuildoutArea.java diff --git a/src/resources/buildout/BuildoutAreaGrid.java b/src/main/java/resources/buildout/BuildoutAreaGrid.java similarity index 100% rename from src/resources/buildout/BuildoutAreaGrid.java rename to src/main/java/resources/buildout/BuildoutAreaGrid.java diff --git a/src/resources/client_info/ServerFactory.java b/src/main/java/resources/client_info/ServerFactory.java similarity index 100% rename from src/resources/client_info/ServerFactory.java rename to src/main/java/resources/client_info/ServerFactory.java diff --git a/src/resources/collections/SWGBitSet.java b/src/main/java/resources/collections/SWGBitSet.java similarity index 100% rename from src/resources/collections/SWGBitSet.java rename to src/main/java/resources/collections/SWGBitSet.java diff --git a/src/resources/collections/SWGFlag.java b/src/main/java/resources/collections/SWGFlag.java similarity index 100% rename from src/resources/collections/SWGFlag.java rename to src/main/java/resources/collections/SWGFlag.java diff --git a/src/resources/collections/SWGList.java b/src/main/java/resources/collections/SWGList.java similarity index 100% rename from src/resources/collections/SWGList.java rename to src/main/java/resources/collections/SWGList.java diff --git a/src/resources/collections/SWGMap.java b/src/main/java/resources/collections/SWGMap.java similarity index 100% rename from src/resources/collections/SWGMap.java rename to src/main/java/resources/collections/SWGMap.java diff --git a/src/resources/collections/SWGSet.java b/src/main/java/resources/collections/SWGSet.java similarity index 100% rename from src/resources/collections/SWGSet.java rename to src/main/java/resources/collections/SWGSet.java diff --git a/src/resources/commands/CombatCommand.java b/src/main/java/resources/commands/CombatCommand.java similarity index 100% rename from src/resources/commands/CombatCommand.java rename to src/main/java/resources/commands/CombatCommand.java diff --git a/src/resources/commands/Command.java b/src/main/java/resources/commands/Command.java similarity index 100% rename from src/resources/commands/Command.java rename to src/main/java/resources/commands/Command.java diff --git a/src/resources/commands/DefaultPriority.java b/src/main/java/resources/commands/DefaultPriority.java similarity index 100% rename from src/resources/commands/DefaultPriority.java rename to src/main/java/resources/commands/DefaultPriority.java diff --git a/src/resources/commands/ICmdCallback.java b/src/main/java/resources/commands/ICmdCallback.java similarity index 100% rename from src/resources/commands/ICmdCallback.java rename to src/main/java/resources/commands/ICmdCallback.java diff --git a/src/resources/commands/callbacks/AdminTeleportCallback.java b/src/main/java/resources/commands/callbacks/AdminTeleportCallback.java similarity index 100% rename from src/resources/commands/callbacks/AdminTeleportCallback.java rename to src/main/java/resources/commands/callbacks/AdminTeleportCallback.java diff --git a/src/resources/commands/callbacks/AttributesCmdCallback.java b/src/main/java/resources/commands/callbacks/AttributesCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/AttributesCmdCallback.java rename to src/main/java/resources/commands/callbacks/AttributesCmdCallback.java diff --git a/src/resources/commands/callbacks/ChangeDanceCallback.java b/src/main/java/resources/commands/callbacks/ChangeDanceCallback.java similarity index 100% rename from src/resources/commands/callbacks/ChangeDanceCallback.java rename to src/main/java/resources/commands/callbacks/ChangeDanceCallback.java diff --git a/src/resources/commands/callbacks/FindFriendCallback.java b/src/main/java/resources/commands/callbacks/FindFriendCallback.java similarity index 100% rename from src/resources/commands/callbacks/FindFriendCallback.java rename to src/main/java/resources/commands/callbacks/FindFriendCallback.java diff --git a/src/resources/commands/callbacks/FlourishCmdCallback.java b/src/main/java/resources/commands/callbacks/FlourishCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/FlourishCmdCallback.java rename to src/main/java/resources/commands/callbacks/FlourishCmdCallback.java diff --git a/src/resources/commands/callbacks/GotoCmdCallback.java b/src/main/java/resources/commands/callbacks/GotoCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/GotoCmdCallback.java rename to src/main/java/resources/commands/callbacks/GotoCmdCallback.java diff --git a/src/resources/commands/callbacks/JumpCmdCallback.java b/src/main/java/resources/commands/callbacks/JumpCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/JumpCmdCallback.java rename to src/main/java/resources/commands/callbacks/JumpCmdCallback.java diff --git a/src/resources/commands/callbacks/KneelCmdCallback.java b/src/main/java/resources/commands/callbacks/KneelCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/KneelCmdCallback.java rename to src/main/java/resources/commands/callbacks/KneelCmdCallback.java diff --git a/src/resources/commands/callbacks/LogoutCmdCallback.java b/src/main/java/resources/commands/callbacks/LogoutCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/LogoutCmdCallback.java rename to src/main/java/resources/commands/callbacks/LogoutCmdCallback.java diff --git a/src/resources/commands/callbacks/PlayerAppearanceCallback.java b/src/main/java/resources/commands/callbacks/PlayerAppearanceCallback.java similarity index 100% rename from src/resources/commands/callbacks/PlayerAppearanceCallback.java rename to src/main/java/resources/commands/callbacks/PlayerAppearanceCallback.java diff --git a/src/resources/commands/callbacks/ProneCmdCallback.java b/src/main/java/resources/commands/callbacks/ProneCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/ProneCmdCallback.java rename to src/main/java/resources/commands/callbacks/ProneCmdCallback.java diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/main/java/resources/commands/callbacks/QaToolCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/QaToolCmdCallback.java rename to src/main/java/resources/commands/callbacks/QaToolCmdCallback.java diff --git a/src/resources/commands/callbacks/RequestBiographyCmdCallback.java b/src/main/java/resources/commands/callbacks/RequestBiographyCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/RequestBiographyCmdCallback.java rename to src/main/java/resources/commands/callbacks/RequestBiographyCmdCallback.java diff --git a/src/resources/commands/callbacks/RequestDraftSlotsCallback.java b/src/main/java/resources/commands/callbacks/RequestDraftSlotsCallback.java similarity index 100% rename from src/resources/commands/callbacks/RequestDraftSlotsCallback.java rename to src/main/java/resources/commands/callbacks/RequestDraftSlotsCallback.java diff --git a/src/resources/commands/callbacks/RequestWaypointCmdCallback.java b/src/main/java/resources/commands/callbacks/RequestWaypointCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/RequestWaypointCmdCallback.java rename to src/main/java/resources/commands/callbacks/RequestWaypointCmdCallback.java diff --git a/src/resources/commands/callbacks/RevertAppearanceCallback.java b/src/main/java/resources/commands/callbacks/RevertAppearanceCallback.java similarity index 100% rename from src/resources/commands/callbacks/RevertAppearanceCallback.java rename to src/main/java/resources/commands/callbacks/RevertAppearanceCallback.java diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/main/java/resources/commands/callbacks/ServerCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/ServerCmdCallback.java rename to src/main/java/resources/commands/callbacks/ServerCmdCallback.java diff --git a/src/resources/commands/callbacks/ServerDestroyObjectCmdCallback.java b/src/main/java/resources/commands/callbacks/ServerDestroyObjectCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/ServerDestroyObjectCmdCallback.java rename to src/main/java/resources/commands/callbacks/ServerDestroyObjectCmdCallback.java diff --git a/src/resources/commands/callbacks/SitOnObjectCmdCallback.java b/src/main/java/resources/commands/callbacks/SitOnObjectCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/SitOnObjectCmdCallback.java rename to src/main/java/resources/commands/callbacks/SitOnObjectCmdCallback.java diff --git a/src/resources/commands/callbacks/SocialInternalCmdCallback.java b/src/main/java/resources/commands/callbacks/SocialInternalCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/SocialInternalCmdCallback.java rename to src/main/java/resources/commands/callbacks/SocialInternalCmdCallback.java diff --git a/src/resources/commands/callbacks/StandCmdCallback.java b/src/main/java/resources/commands/callbacks/StandCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/StandCmdCallback.java rename to src/main/java/resources/commands/callbacks/StandCmdCallback.java diff --git a/src/resources/commands/callbacks/StartDanceCallback.java b/src/main/java/resources/commands/callbacks/StartDanceCallback.java similarity index 100% rename from src/resources/commands/callbacks/StartDanceCallback.java rename to src/main/java/resources/commands/callbacks/StartDanceCallback.java diff --git a/src/resources/commands/callbacks/TransferItemCallback.java b/src/main/java/resources/commands/callbacks/TransferItemCallback.java similarity index 100% rename from src/resources/commands/callbacks/TransferItemCallback.java rename to src/main/java/resources/commands/callbacks/TransferItemCallback.java diff --git a/src/resources/commands/callbacks/WaypointCmdCallback.java b/src/main/java/resources/commands/callbacks/WaypointCmdCallback.java similarity index 100% rename from src/resources/commands/callbacks/WaypointCmdCallback.java rename to src/main/java/resources/commands/callbacks/WaypointCmdCallback.java diff --git a/src/resources/config/ConfigFile.java b/src/main/java/resources/config/ConfigFile.java similarity index 100% rename from src/resources/config/ConfigFile.java rename to src/main/java/resources/config/ConfigFile.java diff --git a/src/resources/containers/AdminPermissions.java b/src/main/java/resources/containers/AdminPermissions.java similarity index 100% rename from src/resources/containers/AdminPermissions.java rename to src/main/java/resources/containers/AdminPermissions.java diff --git a/src/resources/containers/ContainerPermissions.java b/src/main/java/resources/containers/ContainerPermissions.java similarity index 100% rename from src/resources/containers/ContainerPermissions.java rename to src/main/java/resources/containers/ContainerPermissions.java diff --git a/src/resources/containers/ContainerPermissionsType.java b/src/main/java/resources/containers/ContainerPermissionsType.java similarity index 100% rename from src/resources/containers/ContainerPermissionsType.java rename to src/main/java/resources/containers/ContainerPermissionsType.java diff --git a/src/resources/containers/ContainerResult.java b/src/main/java/resources/containers/ContainerResult.java similarity index 100% rename from src/resources/containers/ContainerResult.java rename to src/main/java/resources/containers/ContainerResult.java diff --git a/src/resources/containers/DefaultPermissions.java b/src/main/java/resources/containers/DefaultPermissions.java similarity index 100% rename from src/resources/containers/DefaultPermissions.java rename to src/main/java/resources/containers/DefaultPermissions.java diff --git a/src/resources/containers/InventoryPermissions.java b/src/main/java/resources/containers/InventoryPermissions.java similarity index 100% rename from src/resources/containers/InventoryPermissions.java rename to src/main/java/resources/containers/InventoryPermissions.java diff --git a/src/resources/containers/LootPermissions.java b/src/main/java/resources/containers/LootPermissions.java similarity index 100% rename from src/resources/containers/LootPermissions.java rename to src/main/java/resources/containers/LootPermissions.java diff --git a/src/resources/control/Debugging.java b/src/main/java/resources/control/Debugging.java similarity index 100% rename from src/resources/control/Debugging.java rename to src/main/java/resources/control/Debugging.java diff --git a/src/resources/control/ServerStatus.java b/src/main/java/resources/control/ServerStatus.java similarity index 100% rename from src/resources/control/ServerStatus.java rename to src/main/java/resources/control/ServerStatus.java diff --git a/src/resources/location/InstanceLocation.java b/src/main/java/resources/location/InstanceLocation.java similarity index 100% rename from src/resources/location/InstanceLocation.java rename to src/main/java/resources/location/InstanceLocation.java diff --git a/src/resources/location/InstanceType.java b/src/main/java/resources/location/InstanceType.java similarity index 100% rename from src/resources/location/InstanceType.java rename to src/main/java/resources/location/InstanceType.java diff --git a/src/resources/network/BaselineBuilder.java b/src/main/java/resources/network/BaselineBuilder.java similarity index 100% rename from src/resources/network/BaselineBuilder.java rename to src/main/java/resources/network/BaselineBuilder.java diff --git a/src/resources/network/BaselineObject.java b/src/main/java/resources/network/BaselineObject.java similarity index 100% rename from src/resources/network/BaselineObject.java rename to src/main/java/resources/network/BaselineObject.java diff --git a/src/resources/network/DeltaBuilder.java b/src/main/java/resources/network/DeltaBuilder.java similarity index 100% rename from src/resources/network/DeltaBuilder.java rename to src/main/java/resources/network/DeltaBuilder.java diff --git a/src/resources/network/DisconnectReason.java b/src/main/java/resources/network/DisconnectReason.java similarity index 100% rename from src/resources/network/DisconnectReason.java rename to src/main/java/resources/network/DisconnectReason.java diff --git a/src/resources/network/LittleEndianDataOutputStream.java b/src/main/java/resources/network/LittleEndianDataOutputStream.java similarity index 100% rename from src/resources/network/LittleEndianDataOutputStream.java rename to src/main/java/resources/network/LittleEndianDataOutputStream.java diff --git a/src/resources/network/ServerType.java b/src/main/java/resources/network/ServerType.java similarity index 100% rename from src/resources/network/ServerType.java rename to src/main/java/resources/network/ServerType.java diff --git a/src/resources/network/UDPServer.java b/src/main/java/resources/network/UDPServer.java similarity index 100% rename from src/resources/network/UDPServer.java rename to src/main/java/resources/network/UDPServer.java diff --git a/src/resources/objects/Equipment.java b/src/main/java/resources/objects/Equipment.java similarity index 100% rename from src/resources/objects/Equipment.java rename to src/main/java/resources/objects/Equipment.java diff --git a/src/resources/objects/GameObjectType.java b/src/main/java/resources/objects/GameObjectType.java similarity index 100% rename from src/resources/objects/GameObjectType.java rename to src/main/java/resources/objects/GameObjectType.java diff --git a/src/resources/objects/GameObjectTypeMask.java b/src/main/java/resources/objects/GameObjectTypeMask.java similarity index 100% rename from src/resources/objects/GameObjectTypeMask.java rename to src/main/java/resources/objects/GameObjectTypeMask.java diff --git a/src/resources/objects/SWGObject.java b/src/main/java/resources/objects/SWGObject.java similarity index 100% rename from src/resources/objects/SWGObject.java rename to src/main/java/resources/objects/SWGObject.java diff --git a/src/resources/objects/SpecificObject.java b/src/main/java/resources/objects/SpecificObject.java similarity index 100% rename from src/resources/objects/SpecificObject.java rename to src/main/java/resources/objects/SpecificObject.java diff --git a/src/resources/objects/awareness/Aware.java b/src/main/java/resources/objects/awareness/Aware.java similarity index 100% rename from src/resources/objects/awareness/Aware.java rename to src/main/java/resources/objects/awareness/Aware.java diff --git a/src/resources/objects/awareness/AwarenessHandler.java b/src/main/java/resources/objects/awareness/AwarenessHandler.java similarity index 100% rename from src/resources/objects/awareness/AwarenessHandler.java rename to src/main/java/resources/objects/awareness/AwarenessHandler.java diff --git a/src/resources/objects/awareness/DataTransformHandler.java b/src/main/java/resources/objects/awareness/DataTransformHandler.java similarity index 100% rename from src/resources/objects/awareness/DataTransformHandler.java rename to src/main/java/resources/objects/awareness/DataTransformHandler.java diff --git a/src/resources/objects/awareness/ObjectAware.java b/src/main/java/resources/objects/awareness/ObjectAware.java similarity index 100% rename from src/resources/objects/awareness/ObjectAware.java rename to src/main/java/resources/objects/awareness/ObjectAware.java diff --git a/src/resources/objects/awareness/SpeedCheckHandler.java b/src/main/java/resources/objects/awareness/SpeedCheckHandler.java similarity index 100% rename from src/resources/objects/awareness/SpeedCheckHandler.java rename to src/main/java/resources/objects/awareness/SpeedCheckHandler.java diff --git a/src/resources/objects/awareness/TerrainMap.java b/src/main/java/resources/objects/awareness/TerrainMap.java similarity index 100% rename from src/resources/objects/awareness/TerrainMap.java rename to src/main/java/resources/objects/awareness/TerrainMap.java diff --git a/src/resources/objects/awareness/TerrainMapChunk.java b/src/main/java/resources/objects/awareness/TerrainMapChunk.java similarity index 100% rename from src/resources/objects/awareness/TerrainMapChunk.java rename to src/main/java/resources/objects/awareness/TerrainMapChunk.java diff --git a/src/resources/objects/building/BuildingObject.java b/src/main/java/resources/objects/building/BuildingObject.java similarity index 100% rename from src/resources/objects/building/BuildingObject.java rename to src/main/java/resources/objects/building/BuildingObject.java diff --git a/src/resources/objects/buildouts/BuildoutLoader.java b/src/main/java/resources/objects/buildouts/BuildoutLoader.java similarity index 100% rename from src/resources/objects/buildouts/BuildoutLoader.java rename to src/main/java/resources/objects/buildouts/BuildoutLoader.java diff --git a/src/resources/objects/buildouts/SnapshotLoader.java b/src/main/java/resources/objects/buildouts/SnapshotLoader.java similarity index 100% rename from src/resources/objects/buildouts/SnapshotLoader.java rename to src/main/java/resources/objects/buildouts/SnapshotLoader.java diff --git a/src/resources/objects/buildouts/SwgBuildoutArea.java b/src/main/java/resources/objects/buildouts/SwgBuildoutArea.java similarity index 100% rename from src/resources/objects/buildouts/SwgBuildoutArea.java rename to src/main/java/resources/objects/buildouts/SwgBuildoutArea.java diff --git a/src/resources/objects/buildouts/SwgBuildoutRow.java b/src/main/java/resources/objects/buildouts/SwgBuildoutRow.java similarity index 100% rename from src/resources/objects/buildouts/SwgBuildoutRow.java rename to src/main/java/resources/objects/buildouts/SwgBuildoutRow.java diff --git a/src/resources/objects/buildouts/TerrainBuildoutLoader.java b/src/main/java/resources/objects/buildouts/TerrainBuildoutLoader.java similarity index 100% rename from src/resources/objects/buildouts/TerrainBuildoutLoader.java rename to src/main/java/resources/objects/buildouts/TerrainBuildoutLoader.java diff --git a/src/resources/objects/buildouts/TerrainSnapshotLoader.java b/src/main/java/resources/objects/buildouts/TerrainSnapshotLoader.java similarity index 100% rename from src/resources/objects/buildouts/TerrainSnapshotLoader.java rename to src/main/java/resources/objects/buildouts/TerrainSnapshotLoader.java diff --git a/src/resources/objects/cell/CellObject.java b/src/main/java/resources/objects/cell/CellObject.java similarity index 100% rename from src/resources/objects/cell/CellObject.java rename to src/main/java/resources/objects/cell/CellObject.java diff --git a/src/resources/objects/collections/ClickyCollectionItem.java b/src/main/java/resources/objects/collections/ClickyCollectionItem.java similarity index 100% rename from src/resources/objects/collections/ClickyCollectionItem.java rename to src/main/java/resources/objects/collections/ClickyCollectionItem.java diff --git a/src/resources/objects/collections/CollectionItem.java b/src/main/java/resources/objects/collections/CollectionItem.java similarity index 100% rename from src/resources/objects/collections/CollectionItem.java rename to src/main/java/resources/objects/collections/CollectionItem.java diff --git a/src/resources/objects/creature/Buff.java b/src/main/java/resources/objects/creature/Buff.java similarity index 100% rename from src/resources/objects/creature/Buff.java rename to src/main/java/resources/objects/creature/Buff.java diff --git a/src/resources/objects/creature/CreatureDifficulty.java b/src/main/java/resources/objects/creature/CreatureDifficulty.java similarity index 100% rename from src/resources/objects/creature/CreatureDifficulty.java rename to src/main/java/resources/objects/creature/CreatureDifficulty.java diff --git a/src/resources/objects/creature/CreatureMood.java b/src/main/java/resources/objects/creature/CreatureMood.java similarity index 100% rename from src/resources/objects/creature/CreatureMood.java rename to src/main/java/resources/objects/creature/CreatureMood.java diff --git a/src/resources/objects/creature/CreatureObject.java b/src/main/java/resources/objects/creature/CreatureObject.java similarity index 100% rename from src/resources/objects/creature/CreatureObject.java rename to src/main/java/resources/objects/creature/CreatureObject.java diff --git a/src/resources/objects/creature/CreatureObjectClientServerNP.java b/src/main/java/resources/objects/creature/CreatureObjectClientServerNP.java similarity index 100% rename from src/resources/objects/creature/CreatureObjectClientServerNP.java rename to src/main/java/resources/objects/creature/CreatureObjectClientServerNP.java diff --git a/src/resources/objects/creature/CreatureObjectSharedNP.java b/src/main/java/resources/objects/creature/CreatureObjectSharedNP.java similarity index 100% rename from src/resources/objects/creature/CreatureObjectSharedNP.java rename to src/main/java/resources/objects/creature/CreatureObjectSharedNP.java diff --git a/src/resources/objects/creature/CreatureState.java b/src/main/java/resources/objects/creature/CreatureState.java similarity index 100% rename from src/resources/objects/creature/CreatureState.java rename to src/main/java/resources/objects/creature/CreatureState.java diff --git a/src/resources/objects/custom/AIBehavior.java b/src/main/java/resources/objects/custom/AIBehavior.java similarity index 100% rename from src/resources/objects/custom/AIBehavior.java rename to src/main/java/resources/objects/custom/AIBehavior.java diff --git a/src/resources/objects/custom/AIObject.java b/src/main/java/resources/objects/custom/AIObject.java similarity index 100% rename from src/resources/objects/custom/AIObject.java rename to src/main/java/resources/objects/custom/AIObject.java diff --git a/src/resources/objects/custom/LoiterAIObject.java b/src/main/java/resources/objects/custom/LoiterAIObject.java similarity index 100% rename from src/resources/objects/custom/LoiterAIObject.java rename to src/main/java/resources/objects/custom/LoiterAIObject.java diff --git a/src/resources/objects/custom/PatrolAIObject.java b/src/main/java/resources/objects/custom/PatrolAIObject.java similarity index 100% rename from src/resources/objects/custom/PatrolAIObject.java rename to src/main/java/resources/objects/custom/PatrolAIObject.java diff --git a/src/resources/objects/custom/PatrolGroup.java b/src/main/java/resources/objects/custom/PatrolGroup.java similarity index 100% rename from src/resources/objects/custom/PatrolGroup.java rename to src/main/java/resources/objects/custom/PatrolGroup.java diff --git a/src/resources/objects/custom/RandomAIObject.java b/src/main/java/resources/objects/custom/RandomAIObject.java similarity index 100% rename from src/resources/objects/custom/RandomAIObject.java rename to src/main/java/resources/objects/custom/RandomAIObject.java diff --git a/src/resources/objects/custom/TurningAIObject.java b/src/main/java/resources/objects/custom/TurningAIObject.java similarity index 100% rename from src/resources/objects/custom/TurningAIObject.java rename to src/main/java/resources/objects/custom/TurningAIObject.java diff --git a/src/resources/objects/factory/FactoryObject.java b/src/main/java/resources/objects/factory/FactoryObject.java similarity index 100% rename from src/resources/objects/factory/FactoryObject.java rename to src/main/java/resources/objects/factory/FactoryObject.java diff --git a/src/resources/objects/group/GroupObject.java b/src/main/java/resources/objects/group/GroupObject.java similarity index 100% rename from src/resources/objects/group/GroupObject.java rename to src/main/java/resources/objects/group/GroupObject.java diff --git a/src/resources/objects/group/LootRule.java b/src/main/java/resources/objects/group/LootRule.java similarity index 100% rename from src/resources/objects/group/LootRule.java rename to src/main/java/resources/objects/group/LootRule.java diff --git a/src/resources/objects/guild/GuildObject.java b/src/main/java/resources/objects/guild/GuildObject.java similarity index 100% rename from src/resources/objects/guild/GuildObject.java rename to src/main/java/resources/objects/guild/GuildObject.java diff --git a/src/resources/objects/installation/InstallationObject.java b/src/main/java/resources/objects/installation/InstallationObject.java similarity index 100% rename from src/resources/objects/installation/InstallationObject.java rename to src/main/java/resources/objects/installation/InstallationObject.java diff --git a/src/resources/objects/intangible/IntangibleObject.java b/src/main/java/resources/objects/intangible/IntangibleObject.java similarity index 100% rename from src/resources/objects/intangible/IntangibleObject.java rename to src/main/java/resources/objects/intangible/IntangibleObject.java diff --git a/src/resources/objects/manufacture/ManufactureSchematicObject.java b/src/main/java/resources/objects/manufacture/ManufactureSchematicObject.java similarity index 100% rename from src/resources/objects/manufacture/ManufactureSchematicObject.java rename to src/main/java/resources/objects/manufacture/ManufactureSchematicObject.java diff --git a/src/resources/objects/mission/MissionObject.java b/src/main/java/resources/objects/mission/MissionObject.java similarity index 100% rename from src/resources/objects/mission/MissionObject.java rename to src/main/java/resources/objects/mission/MissionObject.java diff --git a/src/resources/objects/mobile/MobileObject.java b/src/main/java/resources/objects/mobile/MobileObject.java similarity index 100% rename from src/resources/objects/mobile/MobileObject.java rename to src/main/java/resources/objects/mobile/MobileObject.java diff --git a/src/resources/objects/player/PlayerObject.java b/src/main/java/resources/objects/player/PlayerObject.java similarity index 100% rename from src/resources/objects/player/PlayerObject.java rename to src/main/java/resources/objects/player/PlayerObject.java diff --git a/src/resources/objects/player/PlayerObjectPrivate.java b/src/main/java/resources/objects/player/PlayerObjectPrivate.java similarity index 100% rename from src/resources/objects/player/PlayerObjectPrivate.java rename to src/main/java/resources/objects/player/PlayerObjectPrivate.java diff --git a/src/resources/objects/player/PlayerObjectPrivateNP.java b/src/main/java/resources/objects/player/PlayerObjectPrivateNP.java similarity index 100% rename from src/resources/objects/player/PlayerObjectPrivateNP.java rename to src/main/java/resources/objects/player/PlayerObjectPrivateNP.java diff --git a/src/resources/objects/player/PlayerObjectShared.java b/src/main/java/resources/objects/player/PlayerObjectShared.java similarity index 100% rename from src/resources/objects/player/PlayerObjectShared.java rename to src/main/java/resources/objects/player/PlayerObjectShared.java diff --git a/src/resources/objects/player/PlayerObjectSharedNP.java b/src/main/java/resources/objects/player/PlayerObjectSharedNP.java similarity index 100% rename from src/resources/objects/player/PlayerObjectSharedNP.java rename to src/main/java/resources/objects/player/PlayerObjectSharedNP.java diff --git a/src/resources/objects/quadtree/QuadTree.java b/src/main/java/resources/objects/quadtree/QuadTree.java similarity index 100% rename from src/resources/objects/quadtree/QuadTree.java rename to src/main/java/resources/objects/quadtree/QuadTree.java diff --git a/src/resources/objects/resource/ResourceContainerObject.java b/src/main/java/resources/objects/resource/ResourceContainerObject.java similarity index 100% rename from src/resources/objects/resource/ResourceContainerObject.java rename to src/main/java/resources/objects/resource/ResourceContainerObject.java diff --git a/src/resources/objects/ship/ShipObject.java b/src/main/java/resources/objects/ship/ShipObject.java similarity index 100% rename from src/resources/objects/ship/ShipObject.java rename to src/main/java/resources/objects/ship/ShipObject.java diff --git a/src/resources/objects/sound/SoundObject.java b/src/main/java/resources/objects/sound/SoundObject.java similarity index 100% rename from src/resources/objects/sound/SoundObject.java rename to src/main/java/resources/objects/sound/SoundObject.java diff --git a/src/resources/objects/staticobject/StaticObject.java b/src/main/java/resources/objects/staticobject/StaticObject.java similarity index 100% rename from src/resources/objects/staticobject/StaticObject.java rename to src/main/java/resources/objects/staticobject/StaticObject.java diff --git a/src/resources/objects/tangible/CreditObject.java b/src/main/java/resources/objects/tangible/CreditObject.java similarity index 100% rename from src/resources/objects/tangible/CreditObject.java rename to src/main/java/resources/objects/tangible/CreditObject.java diff --git a/src/resources/objects/tangible/OptionFlag.java b/src/main/java/resources/objects/tangible/OptionFlag.java similarity index 100% rename from src/resources/objects/tangible/OptionFlag.java rename to src/main/java/resources/objects/tangible/OptionFlag.java diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/main/java/resources/objects/tangible/TangibleObject.java similarity index 100% rename from src/resources/objects/tangible/TangibleObject.java rename to src/main/java/resources/objects/tangible/TangibleObject.java diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/main/java/resources/objects/waypoint/WaypointObject.java similarity index 100% rename from src/resources/objects/waypoint/WaypointObject.java rename to src/main/java/resources/objects/waypoint/WaypointObject.java diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/main/java/resources/objects/weapon/WeaponObject.java similarity index 100% rename from src/resources/objects/weapon/WeaponObject.java rename to src/main/java/resources/objects/weapon/WeaponObject.java diff --git a/src/resources/objects/weapon/WeaponType.java b/src/main/java/resources/objects/weapon/WeaponType.java similarity index 100% rename from src/resources/objects/weapon/WeaponType.java rename to src/main/java/resources/objects/weapon/WeaponType.java diff --git a/src/resources/persistable/SWGObjectFactory.java b/src/main/java/resources/persistable/SWGObjectFactory.java similarity index 100% rename from src/resources/persistable/SWGObjectFactory.java rename to src/main/java/resources/persistable/SWGObjectFactory.java diff --git a/src/resources/player/AccessLevel.java b/src/main/java/resources/player/AccessLevel.java similarity index 100% rename from src/resources/player/AccessLevel.java rename to src/main/java/resources/player/AccessLevel.java diff --git a/src/resources/player/Player.java b/src/main/java/resources/player/Player.java similarity index 100% rename from src/resources/player/Player.java rename to src/main/java/resources/player/Player.java diff --git a/src/resources/player/PlayerEvent.java b/src/main/java/resources/player/PlayerEvent.java similarity index 100% rename from src/resources/player/PlayerEvent.java rename to src/main/java/resources/player/PlayerEvent.java diff --git a/src/resources/player/PlayerFlags.java b/src/main/java/resources/player/PlayerFlags.java similarity index 100% rename from src/resources/player/PlayerFlags.java rename to src/main/java/resources/player/PlayerFlags.java diff --git a/src/resources/player/PlayerState.java b/src/main/java/resources/player/PlayerState.java similarity index 100% rename from src/resources/player/PlayerState.java rename to src/main/java/resources/player/PlayerState.java diff --git a/src/resources/radial/Radials.java b/src/main/java/resources/radial/Radials.java similarity index 100% rename from src/resources/radial/Radials.java rename to src/main/java/resources/radial/Radials.java diff --git a/src/resources/rewards/RoadmapReward.java b/src/main/java/resources/rewards/RoadmapReward.java similarity index 100% rename from src/resources/rewards/RoadmapReward.java rename to src/main/java/resources/rewards/RoadmapReward.java diff --git a/src/resources/server_info/BasicLogStream.java b/src/main/java/resources/server_info/BasicLogStream.java similarity index 100% rename from src/resources/server_info/BasicLogStream.java rename to src/main/java/resources/server_info/BasicLogStream.java diff --git a/src/resources/server_info/CachedObjectDatabase.java b/src/main/java/resources/server_info/CachedObjectDatabase.java similarity index 100% rename from src/resources/server_info/CachedObjectDatabase.java rename to src/main/java/resources/server_info/CachedObjectDatabase.java diff --git a/src/resources/server_info/ConfigWatcher.java b/src/main/java/resources/server_info/ConfigWatcher.java similarity index 100% rename from src/resources/server_info/ConfigWatcher.java rename to src/main/java/resources/server_info/ConfigWatcher.java diff --git a/src/resources/server_info/DataManager.java b/src/main/java/resources/server_info/DataManager.java similarity index 100% rename from src/resources/server_info/DataManager.java rename to src/main/java/resources/server_info/DataManager.java diff --git a/src/resources/server_info/ObjectDatabase.java b/src/main/java/resources/server_info/ObjectDatabase.java similarity index 100% rename from src/resources/server_info/ObjectDatabase.java rename to src/main/java/resources/server_info/ObjectDatabase.java diff --git a/src/resources/server_info/SdbLoader.java b/src/main/java/resources/server_info/SdbLoader.java similarity index 100% rename from src/resources/server_info/SdbLoader.java rename to src/main/java/resources/server_info/SdbLoader.java diff --git a/src/resources/server_info/StandardLog.java b/src/main/java/resources/server_info/StandardLog.java similarity index 100% rename from src/resources/server_info/StandardLog.java rename to src/main/java/resources/server_info/StandardLog.java diff --git a/src/resources/server_info/loader/BuildingLoader.java b/src/main/java/resources/server_info/loader/BuildingLoader.java similarity index 100% rename from src/resources/server_info/loader/BuildingLoader.java rename to src/main/java/resources/server_info/loader/BuildingLoader.java diff --git a/src/resources/server_info/loader/npc/NpcLoader.java b/src/main/java/resources/server_info/loader/npc/NpcLoader.java similarity index 100% rename from src/resources/server_info/loader/npc/NpcLoader.java rename to src/main/java/resources/server_info/loader/npc/NpcLoader.java diff --git a/src/resources/server_info/loader/npc/NpcPatrolRouteLoader.java b/src/main/java/resources/server_info/loader/npc/NpcPatrolRouteLoader.java similarity index 100% rename from src/resources/server_info/loader/npc/NpcPatrolRouteLoader.java rename to src/main/java/resources/server_info/loader/npc/NpcPatrolRouteLoader.java diff --git a/src/resources/server_info/loader/npc/NpcStatLoader.java b/src/main/java/resources/server_info/loader/npc/NpcStatLoader.java similarity index 100% rename from src/resources/server_info/loader/npc/NpcStatLoader.java rename to src/main/java/resources/server_info/loader/npc/NpcStatLoader.java diff --git a/src/resources/server_info/loader/spawn/StaticSpawnLoader.java b/src/main/java/resources/server_info/loader/spawn/StaticSpawnLoader.java similarity index 100% rename from src/resources/server_info/loader/spawn/StaticSpawnLoader.java rename to src/main/java/resources/server_info/loader/spawn/StaticSpawnLoader.java diff --git a/src/resources/spawn/Spawner.java b/src/main/java/resources/spawn/Spawner.java similarity index 100% rename from src/resources/spawn/Spawner.java rename to src/main/java/resources/spawn/Spawner.java diff --git a/src/resources/spawn/SpawnerType.java b/src/main/java/resources/spawn/SpawnerType.java similarity index 100% rename from src/resources/spawn/SpawnerType.java rename to src/main/java/resources/spawn/SpawnerType.java diff --git a/src/resources/sui/SuiButtons.java b/src/main/java/resources/sui/SuiButtons.java similarity index 100% rename from src/resources/sui/SuiButtons.java rename to src/main/java/resources/sui/SuiButtons.java diff --git a/src/resources/sui/SuiInputBox.java b/src/main/java/resources/sui/SuiInputBox.java similarity index 100% rename from src/resources/sui/SuiInputBox.java rename to src/main/java/resources/sui/SuiInputBox.java diff --git a/src/resources/sui/SuiListBox.java b/src/main/java/resources/sui/SuiListBox.java similarity index 100% rename from src/resources/sui/SuiListBox.java rename to src/main/java/resources/sui/SuiListBox.java diff --git a/src/resources/sui/SuiMessageBox.java b/src/main/java/resources/sui/SuiMessageBox.java similarity index 100% rename from src/resources/sui/SuiMessageBox.java rename to src/main/java/resources/sui/SuiMessageBox.java diff --git a/src/resources/sui/SuiTableWindow.java b/src/main/java/resources/sui/SuiTableWindow.java similarity index 100% rename from src/resources/sui/SuiTableWindow.java rename to src/main/java/resources/sui/SuiTableWindow.java diff --git a/src/resources/sui/SuiWindow.java b/src/main/java/resources/sui/SuiWindow.java similarity index 100% rename from src/resources/sui/SuiWindow.java rename to src/main/java/resources/sui/SuiWindow.java diff --git a/src/resources/zone/NameFilter.java b/src/main/java/resources/zone/NameFilter.java similarity index 100% rename from src/resources/zone/NameFilter.java rename to src/main/java/resources/zone/NameFilter.java diff --git a/src/services/CoreManager.java b/src/main/java/services/CoreManager.java similarity index 100% rename from src/services/CoreManager.java rename to src/main/java/services/CoreManager.java diff --git a/src/services/EngineManager.java b/src/main/java/services/EngineManager.java similarity index 100% rename from src/services/EngineManager.java rename to src/main/java/services/EngineManager.java diff --git a/src/services/ShutdownService.java b/src/main/java/services/ShutdownService.java similarity index 100% rename from src/services/ShutdownService.java rename to src/main/java/services/ShutdownService.java diff --git a/src/services/chat/ChatMailService.java b/src/main/java/services/chat/ChatMailService.java similarity index 100% rename from src/services/chat/ChatMailService.java rename to src/main/java/services/chat/ChatMailService.java diff --git a/src/services/chat/ChatManager.java b/src/main/java/services/chat/ChatManager.java similarity index 100% rename from src/services/chat/ChatManager.java rename to src/main/java/services/chat/ChatManager.java diff --git a/src/services/chat/ChatMember.java b/src/main/java/services/chat/ChatMember.java similarity index 100% rename from src/services/chat/ChatMember.java rename to src/main/java/services/chat/ChatMember.java diff --git a/src/services/chat/ChatRoomContainer.java b/src/main/java/services/chat/ChatRoomContainer.java similarity index 100% rename from src/services/chat/ChatRoomContainer.java rename to src/main/java/services/chat/ChatRoomContainer.java diff --git a/src/services/chat/ChatRoomHandler.java b/src/main/java/services/chat/ChatRoomHandler.java similarity index 100% rename from src/services/chat/ChatRoomHandler.java rename to src/main/java/services/chat/ChatRoomHandler.java diff --git a/src/services/chat/ChatRoomService.java b/src/main/java/services/chat/ChatRoomService.java similarity index 100% rename from src/services/chat/ChatRoomService.java rename to src/main/java/services/chat/ChatRoomService.java diff --git a/src/services/collections/CollectionBadgeManager.java b/src/main/java/services/collections/CollectionBadgeManager.java similarity index 100% rename from src/services/collections/CollectionBadgeManager.java rename to src/main/java/services/collections/CollectionBadgeManager.java diff --git a/src/services/collections/CollectionService.java b/src/main/java/services/collections/CollectionService.java similarity index 100% rename from src/services/collections/CollectionService.java rename to src/main/java/services/collections/CollectionService.java diff --git a/src/services/collections/ExplorationBadgeService.java b/src/main/java/services/collections/ExplorationBadgeService.java similarity index 100% rename from src/services/collections/ExplorationBadgeService.java rename to src/main/java/services/collections/ExplorationBadgeService.java diff --git a/src/services/combat/CombatManager.java b/src/main/java/services/combat/CombatManager.java similarity index 100% rename from src/services/combat/CombatManager.java rename to src/main/java/services/combat/CombatManager.java diff --git a/src/services/combat/CombatXpService.java b/src/main/java/services/combat/CombatXpService.java similarity index 100% rename from src/services/combat/CombatXpService.java rename to src/main/java/services/combat/CombatXpService.java diff --git a/src/services/combat/CorpseService.java b/src/main/java/services/combat/CorpseService.java similarity index 100% rename from src/services/combat/CorpseService.java rename to src/main/java/services/combat/CorpseService.java diff --git a/src/services/combat/DuelPlayerService.java b/src/main/java/services/combat/DuelPlayerService.java similarity index 100% rename from src/services/combat/DuelPlayerService.java rename to src/main/java/services/combat/DuelPlayerService.java diff --git a/src/services/combat/LootService.java b/src/main/java/services/combat/LootService.java similarity index 100% rename from src/services/combat/LootService.java rename to src/main/java/services/combat/LootService.java diff --git a/src/services/commands/BuffService.java b/src/main/java/services/commands/BuffService.java similarity index 100% rename from src/services/commands/BuffService.java rename to src/main/java/services/commands/BuffService.java diff --git a/src/services/commands/CommandContainer.java b/src/main/java/services/commands/CommandContainer.java similarity index 100% rename from src/services/commands/CommandContainer.java rename to src/main/java/services/commands/CommandContainer.java diff --git a/src/services/commands/CommandCooldownHandler.java b/src/main/java/services/commands/CommandCooldownHandler.java similarity index 100% rename from src/services/commands/CommandCooldownHandler.java rename to src/main/java/services/commands/CommandCooldownHandler.java diff --git a/src/services/commands/CommandLauncher.java b/src/main/java/services/commands/CommandLauncher.java similarity index 100% rename from src/services/commands/CommandLauncher.java rename to src/main/java/services/commands/CommandLauncher.java diff --git a/src/services/commands/CommandService.java b/src/main/java/services/commands/CommandService.java similarity index 100% rename from src/services/commands/CommandService.java rename to src/main/java/services/commands/CommandService.java diff --git a/src/services/commands/EntertainmentService.java b/src/main/java/services/commands/EntertainmentService.java similarity index 100% rename from src/services/commands/EntertainmentService.java rename to src/main/java/services/commands/EntertainmentService.java diff --git a/src/services/commands/buff/BuffData.java b/src/main/java/services/commands/buff/BuffData.java similarity index 100% rename from src/services/commands/buff/BuffData.java rename to src/main/java/services/commands/buff/BuffData.java diff --git a/src/services/commands/buff/BuffMap.java b/src/main/java/services/commands/buff/BuffMap.java similarity index 100% rename from src/services/commands/buff/BuffMap.java rename to src/main/java/services/commands/buff/BuffMap.java diff --git a/src/services/crafting/CraftingManager.java b/src/main/java/services/crafting/CraftingManager.java similarity index 100% rename from src/services/crafting/CraftingManager.java rename to src/main/java/services/crafting/CraftingManager.java diff --git a/src/services/crafting/resource/ResourceService.java b/src/main/java/services/crafting/resource/ResourceService.java similarity index 100% rename from src/services/crafting/resource/ResourceService.java rename to src/main/java/services/crafting/resource/ResourceService.java diff --git a/src/services/crafting/resource/galactic/GalacticResource.java b/src/main/java/services/crafting/resource/galactic/GalacticResource.java similarity index 100% rename from src/services/crafting/resource/galactic/GalacticResource.java rename to src/main/java/services/crafting/resource/galactic/GalacticResource.java diff --git a/src/services/crafting/resource/galactic/GalacticResourceLoader.java b/src/main/java/services/crafting/resource/galactic/GalacticResourceLoader.java similarity index 100% rename from src/services/crafting/resource/galactic/GalacticResourceLoader.java rename to src/main/java/services/crafting/resource/galactic/GalacticResourceLoader.java diff --git a/src/services/crafting/resource/galactic/GalacticResourceSpawn.java b/src/main/java/services/crafting/resource/galactic/GalacticResourceSpawn.java similarity index 100% rename from src/services/crafting/resource/galactic/GalacticResourceSpawn.java rename to src/main/java/services/crafting/resource/galactic/GalacticResourceSpawn.java diff --git a/src/services/crafting/resource/galactic/GalacticResourceSpawner.java b/src/main/java/services/crafting/resource/galactic/GalacticResourceSpawner.java similarity index 100% rename from src/services/crafting/resource/galactic/GalacticResourceSpawner.java rename to src/main/java/services/crafting/resource/galactic/GalacticResourceSpawner.java diff --git a/src/services/crafting/resource/galactic/GalacticResourceStats.java b/src/main/java/services/crafting/resource/galactic/GalacticResourceStats.java similarity index 100% rename from src/services/crafting/resource/galactic/GalacticResourceStats.java rename to src/main/java/services/crafting/resource/galactic/GalacticResourceStats.java diff --git a/src/services/crafting/resource/galactic/RawResourceType.java b/src/main/java/services/crafting/resource/galactic/RawResourceType.java similarity index 100% rename from src/services/crafting/resource/galactic/RawResourceType.java rename to src/main/java/services/crafting/resource/galactic/RawResourceType.java diff --git a/src/services/crafting/resource/galactic/storage/GalacticResourceContainer.java b/src/main/java/services/crafting/resource/galactic/storage/GalacticResourceContainer.java similarity index 100% rename from src/services/crafting/resource/galactic/storage/GalacticResourceContainer.java rename to src/main/java/services/crafting/resource/galactic/storage/GalacticResourceContainer.java diff --git a/src/services/crafting/resource/raw/RawResource.java b/src/main/java/services/crafting/resource/raw/RawResource.java similarity index 100% rename from src/services/crafting/resource/raw/RawResource.java rename to src/main/java/services/crafting/resource/raw/RawResource.java diff --git a/src/services/crafting/resource/raw/RawResourceContainer.java b/src/main/java/services/crafting/resource/raw/RawResourceContainer.java similarity index 100% rename from src/services/crafting/resource/raw/RawResourceContainer.java rename to src/main/java/services/crafting/resource/raw/RawResourceContainer.java diff --git a/src/services/crafting/survey/InProgressSampleManager.java b/src/main/java/services/crafting/survey/InProgressSampleManager.java similarity index 100% rename from src/services/crafting/survey/InProgressSampleManager.java rename to src/main/java/services/crafting/survey/InProgressSampleManager.java diff --git a/src/services/crafting/survey/InProgressSurveyManager.java b/src/main/java/services/crafting/survey/InProgressSurveyManager.java similarity index 100% rename from src/services/crafting/survey/InProgressSurveyManager.java rename to src/main/java/services/crafting/survey/InProgressSurveyManager.java diff --git a/src/services/crafting/survey/SampleSession.java b/src/main/java/services/crafting/survey/SampleSession.java similarity index 100% rename from src/services/crafting/survey/SampleSession.java rename to src/main/java/services/crafting/survey/SampleSession.java diff --git a/src/services/crafting/survey/SurveyService.java b/src/main/java/services/crafting/survey/SurveyService.java similarity index 100% rename from src/services/crafting/survey/SurveyService.java rename to src/main/java/services/crafting/survey/SurveyService.java diff --git a/src/services/crafting/survey/SurveySession.java b/src/main/java/services/crafting/survey/SurveySession.java similarity index 100% rename from src/services/crafting/survey/SurveySession.java rename to src/main/java/services/crafting/survey/SurveySession.java diff --git a/src/services/dev/DeveloperService.java b/src/main/java/services/dev/DeveloperService.java similarity index 100% rename from src/services/dev/DeveloperService.java rename to src/main/java/services/dev/DeveloperService.java diff --git a/src/services/experience/ExperienceManager.java b/src/main/java/services/experience/ExperienceManager.java similarity index 100% rename from src/services/experience/ExperienceManager.java rename to src/main/java/services/experience/ExperienceManager.java diff --git a/src/services/experience/ExpertiseService.java b/src/main/java/services/experience/ExpertiseService.java similarity index 100% rename from src/services/experience/ExpertiseService.java rename to src/main/java/services/experience/ExpertiseService.java diff --git a/src/services/experience/SkillManager.java b/src/main/java/services/experience/SkillManager.java similarity index 100% rename from src/services/experience/SkillManager.java rename to src/main/java/services/experience/SkillManager.java diff --git a/src/services/experience/SkillTemplateService.java b/src/main/java/services/experience/SkillTemplateService.java similarity index 100% rename from src/services/experience/SkillTemplateService.java rename to src/main/java/services/experience/SkillTemplateService.java diff --git a/src/services/faction/FactionService.java b/src/main/java/services/faction/FactionService.java similarity index 100% rename from src/services/faction/FactionService.java rename to src/main/java/services/faction/FactionService.java diff --git a/src/services/galaxy/ConnectionService.java b/src/main/java/services/galaxy/ConnectionService.java similarity index 100% rename from src/services/galaxy/ConnectionService.java rename to src/main/java/services/galaxy/ConnectionService.java diff --git a/src/services/galaxy/EnvironmentService.java b/src/main/java/services/galaxy/EnvironmentService.java similarity index 100% rename from src/services/galaxy/EnvironmentService.java rename to src/main/java/services/galaxy/EnvironmentService.java diff --git a/src/services/galaxy/GalacticManager.java b/src/main/java/services/galaxy/GalacticManager.java similarity index 100% rename from src/services/galaxy/GalacticManager.java rename to src/main/java/services/galaxy/GalacticManager.java diff --git a/src/services/galaxy/GameManager.java b/src/main/java/services/galaxy/GameManager.java similarity index 100% rename from src/services/galaxy/GameManager.java rename to src/main/java/services/galaxy/GameManager.java diff --git a/src/services/galaxy/SkillModService.java b/src/main/java/services/galaxy/SkillModService.java similarity index 100% rename from src/services/galaxy/SkillModService.java rename to src/main/java/services/galaxy/SkillModService.java diff --git a/src/services/galaxy/terminals/TerminalService.java b/src/main/java/services/galaxy/terminals/TerminalService.java similarity index 100% rename from src/services/galaxy/terminals/TerminalService.java rename to src/main/java/services/galaxy/terminals/TerminalService.java diff --git a/src/services/galaxy/travel/TravelGroup.java b/src/main/java/services/galaxy/travel/TravelGroup.java similarity index 100% rename from src/services/galaxy/travel/TravelGroup.java rename to src/main/java/services/galaxy/travel/TravelGroup.java diff --git a/src/services/galaxy/travel/TravelHelper.java b/src/main/java/services/galaxy/travel/TravelHelper.java similarity index 100% rename from src/services/galaxy/travel/TravelHelper.java rename to src/main/java/services/galaxy/travel/TravelHelper.java diff --git a/src/services/galaxy/travel/TravelPoint.java b/src/main/java/services/galaxy/travel/TravelPoint.java similarity index 100% rename from src/services/galaxy/travel/TravelPoint.java rename to src/main/java/services/galaxy/travel/TravelPoint.java diff --git a/src/services/galaxy/travel/TravelPointManager.java b/src/main/java/services/galaxy/travel/TravelPointManager.java similarity index 100% rename from src/services/galaxy/travel/TravelPointManager.java rename to src/main/java/services/galaxy/travel/TravelPointManager.java diff --git a/src/services/galaxy/travel/TravelService.java b/src/main/java/services/galaxy/travel/TravelService.java similarity index 100% rename from src/services/galaxy/travel/TravelService.java rename to src/main/java/services/galaxy/travel/TravelService.java diff --git a/src/services/group/GroupInviterData.java b/src/main/java/services/group/GroupInviterData.java similarity index 100% rename from src/services/group/GroupInviterData.java rename to src/main/java/services/group/GroupInviterData.java diff --git a/src/services/group/GroupService.java b/src/main/java/services/group/GroupService.java similarity index 100% rename from src/services/group/GroupService.java rename to src/main/java/services/group/GroupService.java diff --git a/src/services/map/CityService.java b/src/main/java/services/map/CityService.java similarity index 100% rename from src/services/map/CityService.java rename to src/main/java/services/map/CityService.java diff --git a/src/services/map/MapCategory.java b/src/main/java/services/map/MapCategory.java similarity index 100% rename from src/services/map/MapCategory.java rename to src/main/java/services/map/MapCategory.java diff --git a/src/services/map/MapManager.java b/src/main/java/services/map/MapManager.java similarity index 100% rename from src/services/map/MapManager.java rename to src/main/java/services/map/MapManager.java diff --git a/src/services/map/MappingTemplate.java b/src/main/java/services/map/MappingTemplate.java similarity index 100% rename from src/services/map/MappingTemplate.java rename to src/main/java/services/map/MappingTemplate.java diff --git a/src/services/network/AdminNetworkClient.java b/src/main/java/services/network/AdminNetworkClient.java similarity index 100% rename from src/services/network/AdminNetworkClient.java rename to src/main/java/services/network/AdminNetworkClient.java diff --git a/src/services/network/HolocoreSessionManager.java b/src/main/java/services/network/HolocoreSessionManager.java similarity index 100% rename from src/services/network/HolocoreSessionManager.java rename to src/main/java/services/network/HolocoreSessionManager.java diff --git a/src/services/network/NetworkClient.java b/src/main/java/services/network/NetworkClient.java similarity index 100% rename from src/services/network/NetworkClient.java rename to src/main/java/services/network/NetworkClient.java diff --git a/src/services/network/NetworkClientManager.java b/src/main/java/services/network/NetworkClientManager.java similarity index 100% rename from src/services/network/NetworkClientManager.java rename to src/main/java/services/network/NetworkClientManager.java diff --git a/src/services/network/NetworkManager.java b/src/main/java/services/network/NetworkManager.java similarity index 100% rename from src/services/network/NetworkManager.java rename to src/main/java/services/network/NetworkManager.java diff --git a/src/services/objects/ClientBuildoutService.java b/src/main/java/services/objects/ClientBuildoutService.java similarity index 100% rename from src/services/objects/ClientBuildoutService.java rename to src/main/java/services/objects/ClientBuildoutService.java diff --git a/src/services/objects/ObjectAwareness.java b/src/main/java/services/objects/ObjectAwareness.java similarity index 100% rename from src/services/objects/ObjectAwareness.java rename to src/main/java/services/objects/ObjectAwareness.java diff --git a/src/services/objects/ObjectCreator.java b/src/main/java/services/objects/ObjectCreator.java similarity index 100% rename from src/services/objects/ObjectCreator.java rename to src/main/java/services/objects/ObjectCreator.java diff --git a/src/services/objects/ObjectManager.java b/src/main/java/services/objects/ObjectManager.java similarity index 100% rename from src/services/objects/ObjectManager.java rename to src/main/java/services/objects/ObjectManager.java diff --git a/src/services/objects/RadialService.java b/src/main/java/services/objects/RadialService.java similarity index 100% rename from src/services/objects/RadialService.java rename to src/main/java/services/objects/RadialService.java diff --git a/src/services/objects/StaticItemService.java b/src/main/java/services/objects/StaticItemService.java similarity index 100% rename from src/services/objects/StaticItemService.java rename to src/main/java/services/objects/StaticItemService.java diff --git a/src/services/objects/UniformBoxService.java b/src/main/java/services/objects/UniformBoxService.java similarity index 100% rename from src/services/objects/UniformBoxService.java rename to src/main/java/services/objects/UniformBoxService.java diff --git a/src/services/player/CharacterCreationRestriction.java b/src/main/java/services/player/CharacterCreationRestriction.java similarity index 100% rename from src/services/player/CharacterCreationRestriction.java rename to src/main/java/services/player/CharacterCreationRestriction.java diff --git a/src/services/player/CharacterCreationService.java b/src/main/java/services/player/CharacterCreationService.java similarity index 100% rename from src/services/player/CharacterCreationService.java rename to src/main/java/services/player/CharacterCreationService.java diff --git a/src/services/player/LoginService.java b/src/main/java/services/player/LoginService.java similarity index 100% rename from src/services/player/LoginService.java rename to src/main/java/services/player/LoginService.java diff --git a/src/services/player/PlayerManager.java b/src/main/java/services/player/PlayerManager.java similarity index 100% rename from src/services/player/PlayerManager.java rename to src/main/java/services/player/PlayerManager.java diff --git a/src/services/player/TerrainZoneInsertion.java b/src/main/java/services/player/TerrainZoneInsertion.java similarity index 100% rename from src/services/player/TerrainZoneInsertion.java rename to src/main/java/services/player/TerrainZoneInsertion.java diff --git a/src/services/player/ZoneManager.java b/src/main/java/services/player/ZoneManager.java similarity index 100% rename from src/services/player/ZoneManager.java rename to src/main/java/services/player/ZoneManager.java diff --git a/src/services/player/creation/CharacterCreation.java b/src/main/java/services/player/creation/CharacterCreation.java similarity index 100% rename from src/services/player/creation/CharacterCreation.java rename to src/main/java/services/player/creation/CharacterCreation.java diff --git a/src/services/player/zone/ZoneRequester.java b/src/main/java/services/player/zone/ZoneRequester.java similarity index 100% rename from src/services/player/zone/ZoneRequester.java rename to src/main/java/services/player/zone/ZoneRequester.java diff --git a/src/services/spawn/NPCCreator.java b/src/main/java/services/spawn/NPCCreator.java similarity index 100% rename from src/services/spawn/NPCCreator.java rename to src/main/java/services/spawn/NPCCreator.java diff --git a/src/services/spawn/SpawnerService.java b/src/main/java/services/spawn/SpawnerService.java similarity index 100% rename from src/services/spawn/SpawnerService.java rename to src/main/java/services/spawn/SpawnerService.java diff --git a/src/services/spawn/StaticService.java b/src/main/java/services/spawn/StaticService.java similarity index 100% rename from src/services/spawn/StaticService.java rename to src/main/java/services/spawn/StaticService.java diff --git a/src/services/sui/SuiService.java b/src/main/java/services/sui/SuiService.java similarity index 100% rename from src/services/sui/SuiService.java rename to src/main/java/services/sui/SuiService.java diff --git a/src/services/trade/TradeService.java b/src/main/java/services/trade/TradeService.java similarity index 100% rename from src/services/trade/TradeService.java rename to src/main/java/services/trade/TradeService.java diff --git a/src/services/trade/TradeSession.java b/src/main/java/services/trade/TradeSession.java similarity index 100% rename from src/services/trade/TradeSession.java rename to src/main/java/services/trade/TradeSession.java diff --git a/src/utilities/AwarenessUtilities.java b/src/main/java/utilities/AwarenessUtilities.java similarity index 100% rename from src/utilities/AwarenessUtilities.java rename to src/main/java/utilities/AwarenessUtilities.java diff --git a/src/utilities/BuildoutGenerator.java b/src/main/java/utilities/BuildoutGenerator.java similarity index 100% rename from src/utilities/BuildoutGenerator.java rename to src/main/java/utilities/BuildoutGenerator.java diff --git a/src/utilities/IntentFactory.java b/src/main/java/utilities/IntentFactory.java similarity index 100% rename from src/utilities/IntentFactory.java rename to src/main/java/utilities/IntentFactory.java diff --git a/src/utilities/MathUtils.java b/src/main/java/utilities/MathUtils.java similarity index 100% rename from src/utilities/MathUtils.java rename to src/main/java/utilities/MathUtils.java diff --git a/src/utilities/ScheduledUtilities.java b/src/main/java/utilities/ScheduledUtilities.java similarity index 100% rename from src/utilities/ScheduledUtilities.java rename to src/main/java/utilities/ScheduledUtilities.java diff --git a/src/utilities/Scripts.java b/src/main/java/utilities/Scripts.java similarity index 100% rename from src/utilities/Scripts.java rename to src/main/java/utilities/Scripts.java diff --git a/src/utilities/SdbGenerator.java b/src/main/java/utilities/SdbGenerator.java similarity index 100% rename from src/utilities/SdbGenerator.java rename to src/main/java/utilities/SdbGenerator.java diff --git a/src/utilities/buildouts/BuildingListGenerator.java b/src/main/java/utilities/buildouts/BuildingListGenerator.java similarity index 100% rename from src/utilities/buildouts/BuildingListGenerator.java rename to src/main/java/utilities/buildouts/BuildingListGenerator.java diff --git a/src/utilities/clientdata_printer/ClientdataPrinterCommands.java b/src/main/java/utilities/clientdata_printer/ClientdataPrinterCommands.java similarity index 100% rename from src/utilities/clientdata_printer/ClientdataPrinterCommands.java rename to src/main/java/utilities/clientdata_printer/ClientdataPrinterCommands.java diff --git a/src/utilities/clientdata_printer/ClientdataPrinterDatatable.java b/src/main/java/utilities/clientdata_printer/ClientdataPrinterDatatable.java similarity index 100% rename from src/utilities/clientdata_printer/ClientdataPrinterDatatable.java rename to src/main/java/utilities/clientdata_printer/ClientdataPrinterDatatable.java diff --git a/src/utilities/crafting/ResourceSpawnViewer.java b/src/main/java/utilities/crafting/ResourceSpawnViewer.java similarity index 100% rename from src/utilities/crafting/ResourceSpawnViewer.java rename to src/main/java/utilities/crafting/ResourceSpawnViewer.java diff --git a/src/utilities/namegen/RaceNameRule.java b/src/main/java/utilities/namegen/RaceNameRule.java similarity index 100% rename from src/utilities/namegen/RaceNameRule.java rename to src/main/java/utilities/namegen/RaceNameRule.java diff --git a/src/utilities/namegen/SWGNameGenerator.java b/src/main/java/utilities/namegen/SWGNameGenerator.java similarity index 100% rename from src/utilities/namegen/SWGNameGenerator.java rename to src/main/java/utilities/namegen/SWGNameGenerator.java diff --git a/test/main/TestAll.java b/src/test/java/main/TestAll.java similarity index 97% rename from test/main/TestAll.java rename to src/test/java/main/TestAll.java index 97cd41f7a..958740110 100644 --- a/test/main/TestAll.java +++ b/src/test/java/main/TestAll.java @@ -55,7 +55,8 @@ public class TestAll { @AfterClass public static void terminateLog() { DataManager.terminate(); - IntentManager.getInstance().terminate(); + if (IntentManager.getInstance() != null) + IntentManager.getInstance().terminate(); ScheduledUtilities.shutdown(); } diff --git a/test/resources/TestPoint3D.java b/src/test/java/resources/TestPoint3D.java similarity index 100% rename from test/resources/TestPoint3D.java rename to src/test/java/resources/TestPoint3D.java diff --git a/test/resources/TestQuaternion.java b/src/test/java/resources/TestQuaternion.java similarity index 100% rename from test/resources/TestQuaternion.java rename to src/test/java/resources/TestQuaternion.java diff --git a/test/resources/TestResources.java b/src/test/java/resources/TestResources.java similarity index 100% rename from test/resources/TestResources.java rename to src/test/java/resources/TestResources.java diff --git a/test/resources/TestWeatherType.java b/src/test/java/resources/TestWeatherType.java similarity index 100% rename from test/resources/TestWeatherType.java rename to src/test/java/resources/TestWeatherType.java diff --git a/test/resources/collections/TestSWGBitSet.java b/src/test/java/resources/collections/TestSWGBitSet.java similarity index 100% rename from test/resources/collections/TestSWGBitSet.java rename to src/test/java/resources/collections/TestSWGBitSet.java diff --git a/test/resources/collections/TestSWGFlag.java b/src/test/java/resources/collections/TestSWGFlag.java similarity index 100% rename from test/resources/collections/TestSWGFlag.java rename to src/test/java/resources/collections/TestSWGFlag.java diff --git a/test/resources/collections/TestSWGList.java b/src/test/java/resources/collections/TestSWGList.java similarity index 100% rename from test/resources/collections/TestSWGList.java rename to src/test/java/resources/collections/TestSWGList.java diff --git a/test/resources/network/TestLittleEndianDataOutputStream.java b/src/test/java/resources/network/TestLittleEndianDataOutputStream.java similarity index 100% rename from test/resources/network/TestLittleEndianDataOutputStream.java rename to src/test/java/resources/network/TestLittleEndianDataOutputStream.java diff --git a/test/resources/network/TestNetBufferStream.java b/src/test/java/resources/network/TestNetBufferStream.java similarity index 100% rename from test/resources/network/TestNetBufferStream.java rename to src/test/java/resources/network/TestNetBufferStream.java diff --git a/test/resources/objects/TestObjects.java b/src/test/java/resources/objects/TestObjects.java similarity index 100% rename from test/resources/objects/TestObjects.java rename to src/test/java/resources/objects/TestObjects.java diff --git a/test/resources/objects/TestSWGObject.java b/src/test/java/resources/objects/TestSWGObject.java similarity index 100% rename from test/resources/objects/TestSWGObject.java rename to src/test/java/resources/objects/TestSWGObject.java diff --git a/test/resources/objects/awareness/MapCallback.java b/src/test/java/resources/objects/awareness/MapCallback.java similarity index 100% rename from test/resources/objects/awareness/MapCallback.java rename to src/test/java/resources/objects/awareness/MapCallback.java diff --git a/test/resources/objects/awareness/TestAware.java b/src/test/java/resources/objects/awareness/TestAware.java similarity index 100% rename from test/resources/objects/awareness/TestAware.java rename to src/test/java/resources/objects/awareness/TestAware.java diff --git a/test/resources/objects/awareness/TestAwareness.java b/src/test/java/resources/objects/awareness/TestAwareness.java similarity index 100% rename from test/resources/objects/awareness/TestAwareness.java rename to src/test/java/resources/objects/awareness/TestAwareness.java diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/src/test/java/resources/objects/awareness/TestAwarenessHandler.java similarity index 100% rename from test/resources/objects/awareness/TestAwarenessHandler.java rename to src/test/java/resources/objects/awareness/TestAwarenessHandler.java diff --git a/test/resources/objects/awareness/TestBuildoutObjectList.java b/src/test/java/resources/objects/awareness/TestBuildoutObjectList.java similarity index 100% rename from test/resources/objects/awareness/TestBuildoutObjectList.java rename to src/test/java/resources/objects/awareness/TestBuildoutObjectList.java diff --git a/test/resources/objects/awareness/TestObjectAwareness.java b/src/test/java/resources/objects/awareness/TestObjectAwareness.java similarity index 100% rename from test/resources/objects/awareness/TestObjectAwareness.java rename to src/test/java/resources/objects/awareness/TestObjectAwareness.java diff --git a/test/resources/objects/awareness/TestTerrainMap.java b/src/test/java/resources/objects/awareness/TestTerrainMap.java similarity index 100% rename from test/resources/objects/awareness/TestTerrainMap.java rename to src/test/java/resources/objects/awareness/TestTerrainMap.java diff --git a/test/resources/objects/awareness/TestTerrainMapChunk.java b/src/test/java/resources/objects/awareness/TestTerrainMapChunk.java similarity index 100% rename from test/resources/objects/awareness/TestTerrainMapChunk.java rename to src/test/java/resources/objects/awareness/TestTerrainMapChunk.java diff --git a/test/resources/objects/quadtree/TestQuadTree.java b/src/test/java/resources/objects/quadtree/TestQuadTree.java similarity index 100% rename from test/resources/objects/quadtree/TestQuadTree.java rename to src/test/java/resources/objects/quadtree/TestQuadTree.java diff --git a/test/resources/persistable/TestMailPersistable.java b/src/test/java/resources/persistable/TestMailPersistable.java similarity index 100% rename from test/resources/persistable/TestMailPersistable.java rename to src/test/java/resources/persistable/TestMailPersistable.java diff --git a/test/resources/persistable/TestPersistable.java b/src/test/java/resources/persistable/TestPersistable.java similarity index 100% rename from test/resources/persistable/TestPersistable.java rename to src/test/java/resources/persistable/TestPersistable.java diff --git a/test/resources/persistable/TestResourcePersistable.java b/src/test/java/resources/persistable/TestResourcePersistable.java similarity index 100% rename from test/resources/persistable/TestResourcePersistable.java rename to src/test/java/resources/persistable/TestResourcePersistable.java diff --git a/test/resources/persistable/TestSWGPersistable.java b/src/test/java/resources/persistable/TestSWGPersistable.java similarity index 100% rename from test/resources/persistable/TestSWGPersistable.java rename to src/test/java/resources/persistable/TestSWGPersistable.java diff --git a/test/resources/persistable/TestSimplePersistable.java b/src/test/java/resources/persistable/TestSimplePersistable.java similarity index 100% rename from test/resources/persistable/TestSimplePersistable.java rename to src/test/java/resources/persistable/TestSimplePersistable.java diff --git a/test/resources/services/TestConfig.java b/src/test/java/resources/services/TestConfig.java similarity index 100% rename from test/resources/services/TestConfig.java rename to src/test/java/resources/services/TestConfig.java diff --git a/test/services/TestServices.java b/src/test/java/services/TestServices.java similarity index 100% rename from test/services/TestServices.java rename to src/test/java/services/TestServices.java diff --git a/test/services/crafting/TestCrafting.java b/src/test/java/services/crafting/TestCrafting.java similarity index 100% rename from test/services/crafting/TestCrafting.java rename to src/test/java/services/crafting/TestCrafting.java diff --git a/test/services/crafting/resource/raw/TestRawResource.java b/src/test/java/services/crafting/resource/raw/TestRawResource.java similarity index 100% rename from test/services/crafting/resource/raw/TestRawResource.java rename to src/test/java/services/crafting/resource/raw/TestRawResource.java diff --git a/test/services/crafting/resource/raw/TestRawResourceContainer.java b/src/test/java/services/crafting/resource/raw/TestRawResourceContainer.java similarity index 100% rename from test/services/crafting/resource/raw/TestRawResourceContainer.java rename to src/test/java/services/crafting/resource/raw/TestRawResourceContainer.java diff --git a/test/services/galaxy/TestGalaxy.java b/src/test/java/services/galaxy/TestGalaxy.java similarity index 100% rename from test/services/galaxy/TestGalaxy.java rename to src/test/java/services/galaxy/TestGalaxy.java diff --git a/test/services/galaxy/travel/TestTravelGroup.java b/src/test/java/services/galaxy/travel/TestTravelGroup.java similarity index 100% rename from test/services/galaxy/travel/TestTravelGroup.java rename to src/test/java/services/galaxy/travel/TestTravelGroup.java diff --git a/test/services/galaxy/travel/TestTravelHelper.java b/src/test/java/services/galaxy/travel/TestTravelHelper.java similarity index 100% rename from test/services/galaxy/travel/TestTravelHelper.java rename to src/test/java/services/galaxy/travel/TestTravelHelper.java diff --git a/test/services/player/TestPlayer.java b/src/test/java/services/player/TestPlayer.java similarity index 100% rename from test/services/player/TestPlayer.java rename to src/test/java/services/player/TestPlayer.java diff --git a/test/services/player/zone/TestZoneRequester.java b/src/test/java/services/player/zone/TestZoneRequester.java similarity index 100% rename from test/services/player/zone/TestZoneRequester.java rename to src/test/java/services/player/zone/TestZoneRequester.java diff --git a/test/test_resources/GenericCreatureObject.java b/src/test/java/test_resources/GenericCreatureObject.java similarity index 100% rename from test/test_resources/GenericCreatureObject.java rename to src/test/java/test_resources/GenericCreatureObject.java