From f4fd78fc5dd09b24d4974e34feae6d8fa3bb2194 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sun, 23 Aug 2020 03:26:06 +0200 Subject: [PATCH] Restructure repository * Move /common/src to /src * Move services to net.psforever package * Move /pslogin to /server --- .codecov.yml | 23 +- .github/workflows/ci.yaml | 8 +- Dockerfile | 10 +- README.md | 151 ++++++---- build.sbt | 65 ++--- .../scala/services/account/IPAddress.scala | 11 - .../resources/db/migration/V001__Init.sql | 0 .../db/migration/V002__Buildings.sql | 0 .../resources/db/migration/V003__Avatar.sql | 0 .../resources/overrides/game_objects0.adb.lst | 0 .../overrides/game_objects29.adb.lst | 0 .../overrides/game_objects30.adb.lst | 0 .../overrides/game_objects31.adb.lst | 0 .../overrides/game_objects32.adb.lst | 0 .../scala/net/psforever/server/Server.scala | 58 ++-- .../src/test/resources/logback-test.xml | 0 .../src/test/resources/testconfig.ini | 0 .../src/test/scala/MDCTestProbe.scala | 0 .../test/scala/PacketCodingActorTest.scala | 0 .../src/test/scala/actor/base/ActorTest.scala | 0 .../actor/objects/VehicleSpawnPadTest.scala | 4 +- .../actor/service/AvatarServiceTest.scala | 4 +- .../scodec/interop/akka/PrivacyHelper.java | 0 {common/src => src}/main/resources/akka.conf | 0 .../main/resources/application.conf | 2 +- .../main/resources/dispatchers.conf | 0 .../main/resources/zonemaps/lattice.json | 0 .../main/resources/zonemaps/map01.json | 0 .../main/resources/zonemaps/map02.json | 0 .../main/resources/zonemaps/map03.json | 0 .../main/resources/zonemaps/map04.json | 0 .../main/resources/zonemaps/map05.json | 0 .../main/resources/zonemaps/map06.json | 0 .../main/resources/zonemaps/map07.json | 0 .../main/resources/zonemaps/map08.json | 0 .../main/resources/zonemaps/map09.json | 0 .../main/resources/zonemaps/map10.json | 0 .../main/resources/zonemaps/map11.json | 0 .../main/resources/zonemaps/map12.json | 0 .../main/resources/zonemaps/map13.json | 0 .../main/resources/zonemaps/map96.json | 0 .../main/resources/zonemaps/map97.json | 0 .../main/resources/zonemaps/map98.json | 0 .../main/resources/zonemaps/map99.json | 0 .../main/resources/zonemaps/ugd01.json | 0 .../main/resources/zonemaps/ugd02.json | 0 .../main/resources/zonemaps/ugd03.json | 0 .../main/resources/zonemaps/ugd04.json | 0 .../main/resources/zonemaps/ugd05.json | 0 .../main/resources/zonemaps/ugd06.json | 0 .../scala/akka/actor/MDCContextAware.scala | 0 .../MDCPropagatingExecutionContext.scala | 0 .../scala/net/psforever/IFinalizable.scala | 0 .../actors/commands/NtuCommand.scala | 0 .../actors/session/AvatarActor.scala | 6 +- .../psforever/actors/session/ChatActor.scala | 4 +- .../actors/session/SessionActor.scala | 31 +- .../psforever/actors/zone/BuildingActor.scala | 6 +- .../net/psforever/actors/zone/ZoneActor.scala | 0 .../psforever/crypto/CryptoInterface.scala | 0 .../psforever/login/CryptoSessionActor.scala | 0 .../psforever/login/LoginSessionActor.scala | 7 +- .../psforever/login/PacketCodingActor.scala | 0 .../scala/net/psforever/login/Session.scala | 0 .../net/psforever/login/SessionRouter.scala | 16 +- .../net/psforever/login/TcpListener.scala | 0 .../net/psforever/login/UdpListener.scala | 0 .../psforever/login/UdpNetworkSimulator.scala | 0 .../net/psforever/login/WorldSession.scala | 5 +- .../psforever/login/psadmin/CmdInternal.scala | 0 .../login/psadmin/CmdListPlayers.scala | 2 +- .../psforever/login/psadmin/CmdShutdown.scala | 0 .../login/psadmin/PsAdminActor.scala | 4 +- .../login/psadmin/PsAdminCommands.scala | 4 +- .../newcodecs/BinaryChoiceCodec.scala | 0 .../newcodecs/PrefixedVectorCodec.scala | 0 .../newcodecs/QuantizedDoubleCodec.scala | 0 .../net/psforever/newcodecs/package.scala | 0 .../scala/net/psforever/objects/Account.scala | 0 .../scala/net/psforever/objects/AmmoBox.scala | 0 .../psforever/objects/BoomerDeployable.scala | 0 .../net/psforever/objects/BoomerTrigger.scala | 0 .../psforever/objects/ConstructionItem.scala | 0 .../scala/net/psforever/objects/Default.scala | 0 .../net/psforever/objects/Deployables.scala | 4 +- .../objects/ExplosiveDeployable.scala | 6 +- .../psforever/objects/GlobalDefinitions.scala | 0 .../scala/net/psforever/objects/Kit.scala | 0 .../psforever/objects/LivePlayerList.scala | 0 .../psforever/objects/LocalProjectile.scala | 0 .../psforever/objects/LockerContainer.scala | 4 +- .../scala/net/psforever/objects/Ntu.scala | 0 .../net/psforever/objects/ObjectType.scala | 0 .../objects/OffhandEquipmentSlot.scala | 0 .../psforever/objects/OwnableByPlayer.scala | 0 .../objects/PlanetSideGameObject.scala | 0 .../scala/net/psforever/objects/Player.scala | 0 .../scala/net/psforever/objects/Players.scala | 7 +- .../psforever/objects/SensorDeployable.scala | 6 +- .../scala/net/psforever/objects/Session.scala | 0 .../objects/ShieldGeneratorDeployable.scala | 4 +- .../net/psforever/objects/SimpleItem.scala | 0 .../net/psforever/objects/SpawnPoint.scala | 0 .../scala/net/psforever/objects/Telepad.scala | 0 .../psforever/objects/TelepadDeployable.scala | 0 .../scala/net/psforever/objects/Tool.scala | 0 .../psforever/objects/TrapDeployable.scala | 0 .../psforever/objects/TurretDeployable.scala | 0 .../scala/net/psforever/objects/Vehicle.scala | 0 .../net/psforever/objects/Vehicles.scala | 11 +- .../net/psforever/objects/avatar/Avatar.scala | 0 .../psforever/objects/avatar/Avatars.scala | 0 .../psforever/objects/avatar/BattleRank.scala | 0 .../objects/avatar/Certification.scala | 0 .../objects/avatar/CommandRank.scala | 0 .../objects/avatar/CorpseControl.scala | 4 +- .../psforever/objects/avatar/Cosmetic.scala | 0 .../objects/avatar/DeployableToolbox.scala | 0 .../objects/avatar/FirstTimeEvents.scala | 0 .../psforever/objects/avatar/Implant.scala | 0 .../objects/avatar/LoadoutManager.scala | 0 .../objects/avatar/PlayerControl.scala | 6 +- .../ballistics/ComplexDeployableSource.scala | 0 .../objects/ballistics/DeployableSource.scala | 0 .../objects/ballistics/ObjectSource.scala | 0 .../objects/ballistics/PlayerSource.scala | 0 .../objects/ballistics/Projectile.scala | 0 .../ballistics/ProjectileResolution.scala | 0 .../objects/ballistics/Projectiles.scala | 0 .../ballistics/ResolvedProjectile.scala | 0 .../objects/ballistics/SourceEntry.scala | 0 .../objects/ballistics/VehicleSource.scala | 0 .../objects/ce/ComplexDeployable.scala | 0 .../net/psforever/objects/ce/Deployable.scala | 0 .../objects/ce/DeployableCategory.scala | 0 .../psforever/objects/ce/DeployedItem.scala | 0 .../objects/ce/SimpleDeployable.scala | 0 .../psforever/objects/ce/TelepadLike.scala | 0 .../definition/AmmoBoxDefinition.scala | 0 .../objects/definition/AvatarDefinition.scala | 0 .../objects/definition/BasicDefinition.scala | 0 .../objects/definition/CargoDefinition.scala | 0 .../ConstructionItemDefinition.scala | 0 .../definition/EquipmentDefinition.scala | 0 .../definition/ExoSuitDefinition.scala | 0 .../definition/ImplantDefinition.scala | 0 .../objects/definition/KitDefinition.scala | 0 .../objects/definition/ObjectDefinition.scala | 0 .../definition/ProjectileDefinition.scala | 0 .../objects/definition/SeatDefinition.scala | 0 .../SimpleDeployableDefinition.scala | 0 .../definition/SimpleItemDefinition.scala | 0 .../objects/definition/ToolDefinition.scala | 0 .../definition/VehicleDefinition.scala | 0 .../definition/converter/ACEConverter.scala | 0 .../converter/AmmoBoxConverter.scala | 0 .../converter/AvatarConverter.scala | 0 .../converter/BoomerTriggerConverter.scala | 0 .../converter/CharacterSelectConverter.scala | 0 .../converter/CommandDetonaterConverter.scala | 0 .../converter/CorpseConverter.scala | 0 .../converter/DestroyedVehicleConverter.scala | 0 .../converter/DroppodConverter.scala | 0 .../converter/FieldTurretConverter.scala | 0 .../InternalTelepadDeployableConverter.scala | 0 .../definition/converter/KitConverter.scala | 0 .../converter/LockerContainerConverter.scala | 0 .../converter/PacketConverter.scala | 0 .../converter/ProjectileConverter.scala | 0 .../definition/converter/REKConverter.scala | 0 .../definition/converter/SeatConverter.scala | 0 .../converter/ShieldGeneratorConverter.scala | 0 .../converter/SmallDeployableConverter.scala | 0 .../converter/SmallTurretConverter.scala | 0 .../converter/SpawnTubeConverter.scala | 0 .../definition/converter/StatConverter.scala | 0 .../definition/converter/TRAPConverter.scala | 0 .../converter/TelepadConverter.scala | 0 .../TelepadDeployableConverter.scala | 0 .../converter/TerminalConverter.scala | 0 .../definition/converter/ToolConverter.scala | 0 .../converter/UtilityVehicleConverter.scala | 0 .../converter/VariantVehicleConverter.scala | 0 .../converter/VehicleConverter.scala | 0 .../objects/entity/GUIDException.scala | 0 .../objects/entity/Identifiable.scala | 0 .../objects/entity/IdentifiableEntity.scala | 0 .../objects/entity/SimpleWorldEntity.scala | 0 .../objects/entity/WorldEntity.scala | 0 .../psforever/objects/equipment/Ammo.scala | 0 .../psforever/objects/equipment/CItem.scala | 0 .../objects/equipment/EffectTarget.scala | 0 .../objects/equipment/Equipment.scala | 0 .../objects/equipment/EquipmentSize.scala | 0 .../objects/equipment/EquipmentSlot.scala | 0 .../equipment/FireModeDefinition.scala | 0 .../objects/equipment/FireModeSwitch.scala | 0 .../objects/equipment/JammingUnit.scala | 4 +- .../psforever/objects/equipment/Kits.scala | 0 .../objects/equipment/RemoteUnit.scala | 0 .../psforever/objects/equipment/SItem.scala | 0 .../objects/guid/AvailabilityPolicy.scala | 0 .../net/psforever/objects/guid/GUIDTask.scala | 0 .../objects/guid/NumberPoolHub.scala | 0 .../net/psforever/objects/guid/Task.scala | 0 .../psforever/objects/guid/TaskResolver.scala | 0 .../objects/guid/actor/NumberPoolActor.scala | 0 .../objects/guid/actor/Register.scala | 0 .../guid/actor/UniqueNumberSystem.scala | 0 .../objects/guid/actor/Unregister.scala | 0 .../objects/guid/key/LoanedKey.scala | 0 .../psforever/objects/guid/key/Monitor.scala | 0 .../objects/guid/key/SecureKey.scala | 0 .../objects/guid/pool/ExclusivePool.scala | 0 .../objects/guid/pool/GenericPool.scala | 0 .../objects/guid/pool/NumberPool.scala | 0 .../objects/guid/pool/SimplePool.scala | 0 .../guid/selector/NumberSelector.scala | 0 .../guid/selector/OpportunisticSelector.scala | 0 .../guid/selector/RandomSelector.scala | 0 .../selector/RandomSequenceSelector.scala | 0 .../guid/selector/SpecificSelector.scala | 0 .../guid/selector/StrictInOrderSelector.scala | 0 .../psforever/objects/guid/source/Key.scala | 0 .../guid/source/LimitedNumberSource.scala | 0 .../objects/guid/source/NumberSource.scala | 0 .../objects/inventory/Container.scala | 0 .../objects/inventory/GridInventory.scala | 0 .../InventoryDisarrayException.scala | 0 .../inventory/InventoryEquipmentSlot.scala | 0 .../objects/inventory/InventoryItem.scala | 0 .../objects/inventory/InventoryTile.scala | 0 .../objects/loadouts/EquipmentLoadout.scala | 0 .../objects/loadouts/InfantryLoadout.scala | 0 .../psforever/objects/loadouts/Loadout.scala | 0 .../objects/loadouts/SquadLoadout.scala | 0 .../objects/loadouts/VehicleLoadout.scala | 0 .../objects/serverobject/CommonMessages.scala | 0 .../serverobject/PlanetSideServerObject.scala | 0 .../serverobject/ServerObjectBuilder.scala | 0 .../affinity/FactionAffinity.scala | 0 .../affinity/FactionAffinityBehavior.scala | 0 .../containable/ContainableBehavior.scala | 0 .../serverobject/damage/Damageable.scala | 0 .../damage/DamageableAmenity.scala | 2 +- .../damage/DamageableEntity.scala | 4 +- .../damage/DamageableMountable.scala | 5 +- .../damage/DamageableVehicle.scala | 4 +- .../damage/DamageableWeaponTurret.scala | 8 +- .../serverobject/deploy/Deployment.scala | 0 .../deploy/DeploymentBehavior.scala | 5 +- .../objects/serverobject/doors/Door.scala | 0 .../serverobject/doors/DoorControl.scala | 0 .../serverobject/doors/DoorDefinition.scala | 0 .../serverobject/generator/Generator.scala | 0 .../generator/GeneratorControl.scala | 5 +- .../generator/GeneratorDefinition.scala | 0 .../hackable/GenericHackables.scala | 9 +- .../serverobject/hackable/Hackable.scala | 0 .../hackable/HackableBehavior.scala | 0 .../hackable/HackableDefinition.scala | 0 .../implantmech/ImplantTerminalMech.scala | 0 .../ImplantTerminalMechControl.scala | 0 .../ImplantTerminalMechDefinition.scala | 0 .../objects/serverobject/locks/IFFLock.scala | 0 .../serverobject/locks/IFFLockControl.scala | 0 .../locks/IFFLockDefinition.scala | 0 .../objects/serverobject/locks/IFFLocks.scala | 5 +- .../serverobject/mblocker/Locker.scala | 0 .../serverobject/mblocker/LockerControl.scala | 0 .../mblocker/LockerDefinition.scala | 0 .../serverobject/mount/Mountable.scala | 0 .../mount/MountableBehavior.scala | 0 .../pad/VehicleSpawnControl.scala | 5 +- .../serverobject/pad/VehicleSpawnPad.scala | 0 .../pad/VehicleSpawnPadDefinition.scala | 0 .../pad/process/VehicleSpawnControlBase.scala | 0 .../VehicleSpawnControlConcealPlayer.scala | 0 .../VehicleSpawnControlDriverControl.scala | 0 .../VehicleSpawnControlFinalClearance.scala | 2 +- .../VehicleSpawnControlLoadVehicle.scala | 0 .../process/VehicleSpawnControlRailJack.scala | 0 .../VehicleSpawnControlSeatDriver.scala | 0 ...cleSpawnControlServerVehicleOverride.scala | 0 .../serverobject/painbox/Painbox.scala | 0 .../serverobject/painbox/PainboxControl.scala | 2 +- .../painbox/PainboxDefinition.scala | 0 .../serverobject/repair/Repairable.scala | 0 .../repair/RepairableAmenity.scala | 2 +- .../repair/RepairableEntity.scala | 6 +- .../repair/RepairableVehicle.scala | 0 .../repair/RepairableWeaponTurret.scala | 4 +- .../resourcesilo/ResourceSilo.scala | 0 .../resourcesilo/ResourceSiloControl.scala | 6 +- .../resourcesilo/ResourceSiloDefinition.scala | 0 .../serverobject/structures/Amenity.scala | 0 .../structures/AmenityDefinition.scala | 0 .../structures/AmenityOwner.scala | 0 .../serverobject/structures/Building.scala | 4 +- .../structures/BuildingDefinition.scala | 0 .../structures/FoundationBuilder.scala | 0 .../structures/SphereOfInfluence.scala | 0 .../structures/StructureType.scala | 0 .../serverobject/structures/WarpGate.scala | 0 .../terminals/CaptureTerminal.scala | 0 .../terminals/CaptureTerminalControl.scala | 0 .../terminals/CaptureTerminalDefinition.scala | 0 .../terminals/CaptureTerminals.scala | 2 +- .../EquipmentTerminalDefinition.scala | 0 .../GeneratorTerminalDefinition.scala | 0 .../terminals/ImplantTerminalDefinition.scala | 0 .../terminals/MatrixTerminalDefinition.scala | 0 .../terminals/MedicalTerminalDefinition.scala | 0 .../terminals/OrderTerminalDefinition.scala | 0 .../terminals/ProximityDefinition.scala | 0 .../terminals/ProximityTerminal.scala | 5 +- .../terminals/ProximityTerminalControl.scala | 0 .../ProximityTerminalDefinition.scala | 3 +- .../terminals/ProximityUnit.scala | 0 .../serverobject/terminals/Terminal.scala | 3 +- .../terminals/TerminalControl.scala | 0 .../terminals/TerminalDefinition.scala | 0 .../terminals/VehicleTerminalDefinition.scala | 0 .../transfer/TransferBehavior.scala | 0 .../transfer/TransferContainer.scala | 0 .../objects/serverobject/tube/SpawnTube.scala | 0 .../serverobject/tube/SpawnTubeControl.scala | 0 .../tube/SpawnTubeDefinition.scala | 0 .../serverobject/turret/FacilityTurret.scala | 0 .../turret/FacilityTurretControl.scala | 5 +- .../turret/FacilityTurretDefinition.scala | 0 .../turret/TurretDefinition.scala | 0 .../serverobject/turret/TurretUpgrade.scala | 0 .../serverobject/turret/WeaponTurret.scala | 0 .../serverobject/turret/WeaponTurrets.scala | 13 +- .../serverobject/zipline/ZipLinePath.scala | 0 .../psforever/objects/teamwork/Member.scala | 0 .../psforever/objects/teamwork/Squad.scala | 0 .../objects/teamwork/SquadFeatures.scala | 4 +- .../vehicles/AccessPermissionGroup.scala | 0 .../vehicles/AntTransferBehavior.scala | 4 +- .../psforever/objects/vehicles/Cargo.scala | 0 .../objects/vehicles/CargoBehavior.scala | 6 +- .../vehicles/CargoVehicleRestriction.scala | 0 .../objects/vehicles/DestroyedVehicle.scala | 0 .../objects/vehicles/MountedWeapons.scala | 0 .../net/psforever/objects/vehicles/Seat.scala | 0 .../vehicles/SeatArmorRestriction.scala | 0 .../psforever/objects/vehicles/Turrets.scala | 0 .../psforever/objects/vehicles/Utility.scala | 0 .../objects/vehicles/VehicleControl.scala | 11 +- .../objects/vehicles/VehicleLockState.scala | 0 .../objects/vehicles/VehicleManifest.scala | 0 .../objects/vital/DamageResistanceModel.scala | 0 .../psforever/objects/vital/DamageType.scala | 0 .../objects/vital/StandardDamageProfile.scala | 0 .../vital/StandardResistanceProfile.scala | 0 .../objects/vital/StandardResistances.scala | 0 .../objects/vital/StandardResolutions.scala | 0 .../psforever/objects/vital/Vitality.scala | 0 .../objects/vital/VitalityDefinition.scala | 0 .../objects/vital/VitalsHistory.scala | 0 .../vital/damage/DamageCalculations.scala | 0 .../vital/damage/DamageModifiers.scala | 0 .../objects/vital/damage/DamageProfile.scala | 0 .../projectile/ProjectileCalculations.scala | 0 .../resistance/ResistanceCalculations.scala | 0 .../vital/resistance/ResistanceProfile.scala | 0 .../resistance/ResistanceSelection.scala | 0 .../resolution/DamageResistCalculations.scala | 0 .../resolution/ResolutionCalculations.scala | 0 .../resolution/ResolutionSelection.scala | 0 .../psforever/objects/zones/HotSpotInfo.scala | 0 .../net/psforever/objects/zones/MapInfo.scala | 0 .../psforever/objects/zones/MapScale.scala | 0 .../zones/SphereOfInfluenceActor.scala | 0 .../net/psforever/objects/zones/Zone.scala | 6 +- .../psforever/objects/zones/ZoneAware.scala | 0 .../objects/zones/ZoneDeployableActor.scala | 0 .../objects/zones/ZoneGroundActor.scala | 5 +- .../objects/zones/ZoneHotSpotProjector.scala | 2 +- .../psforever/objects/zones/ZoneInfo.scala | 0 .../net/psforever/objects/zones/ZoneMap.scala | 0 .../objects/zones/ZonePopulationActor.scala | 0 .../objects/zones/ZoneVehicleActor.scala | 0 .../net/psforever/objects/zones/Zoning.scala | 0 .../packet/ControlPacketOpcode.scala | 0 .../psforever/packet/CryptoPacketOpcode.scala | 0 .../psforever/packet/GamePacketOpcode.scala | 0 .../scala/net/psforever/packet/PSPacket.scala | 0 .../net/psforever/packet/PacketCoding.scala | 0 .../packet/control/ClientStart.scala | 0 .../packet/control/ConnectionClose.scala | 0 .../packet/control/ControlSync.scala | 0 .../packet/control/ControlSyncResp.scala | 0 .../packet/control/HandleGamePacket.scala | 0 .../packet/control/MultiPacket.scala | 0 .../packet/control/MultiPacketCollector.scala | 0 .../packet/control/MultiPacketEx.scala | 0 .../psforever/packet/control/RelatedA.scala | 0 .../psforever/packet/control/RelatedB.scala | 0 .../packet/control/ServerStart.scala | 0 .../packet/control/SlottedMetaPacket.scala | 0 .../packet/control/TeardownConnection.scala | 0 .../packet/crypto/ClientChallengeXchg.scala | 4 +- .../packet/crypto/ClientFinished.scala | 0 .../packet/crypto/ServerChallengeXchg.scala | 0 .../packet/crypto/ServerFinished.scala | 0 .../packet/game/ActionCancelMessage.scala | 0 .../packet/game/ActionProgressMessage.scala | 0 .../packet/game/ActionResultMessage.scala | 0 .../packet/game/ArmorChangedMessage.scala | 0 .../packet/game/AvatarDeadStateMessage.scala | 0 .../game/AvatarFirstTimeEventMessage.scala | 0 .../game/AvatarGrenadeStateMessage.scala | 0 .../packet/game/AvatarImplantMessage.scala | 0 .../packet/game/AvatarJumpMessage.scala | 0 .../game/AvatarSearchCriteriaMessage.scala | 0 .../packet/game/AvatarStatisticsMessage.scala | 0 .../game/AvatarVehicleTimerMessage.scala | 0 .../packet/game/BattleExperienceMessage.scala | 0 .../packet/game/BattleplanMessage.scala | 0 .../packet/game/BeginZoningMessage.scala | 0 .../packet/game/BindPlayerMessage.scala | 0 .../game/BroadcastWarpgateUpdateMessage.scala | 0 .../packet/game/BugReportMessage.scala | 0 .../game/BuildingInfoUpdateMessage.scala | 0 .../game/CargoMountPointStatusMessage.scala | 0 .../packet/game/ChainLashMessage.scala | 0 .../packet/game/ChangeAmmoMessage.scala | 0 .../packet/game/ChangeFireModeMessage.scala | 0 .../game/ChangeFireStateMessage_Start.scala | 0 .../game/ChangeFireStateMessage_Stop.scala | 0 .../game/ChangeShortcutBankMessage.scala | 0 .../game/CharacterCreateRequestMessage.scala | 0 .../packet/game/CharacterInfoMessage.scala | 0 .../game/CharacterKnowledgeMessage.scala | 0 .../game/CharacterNoRecordMessage.scala | 0 .../packet/game/CharacterRequestMessage.scala | 0 .../net/psforever/packet/game/ChatMsg.scala | 0 .../packet/game/ChildObjectStateMessage.scala | 0 .../packet/game/ConnectToWorldMessage.scala | 0 .../game/ConnectToWorldRequestMessage.scala | 0 .../game/ContinentalLockUpdateMessage.scala | 0 .../packet/game/CreateShortcutMessage.scala | 0 .../packet/game/DamageFeedbackMessage.scala | 0 .../psforever/packet/game/DamageMessage.scala | 0 .../game/DamageWithPositionMessage.scala | 0 .../psforever/packet/game/DataChallenge.scala | 0 .../packet/game/DataChallengeMessage.scala | 0 .../game/DataChallengeMessageResp.scala | 0 .../packet/game/DelayedPathMountMsg.scala | 0 .../game/DensityLevelUpdateMessage.scala | 0 .../packet/game/DeployObjectMessage.scala | 0 .../packet/game/DeployRequestMessage.scala | 0 .../game/DeployableObjectsInfoMessage.scala | 0 .../packet/game/DestroyDisplayMessage.scala | 0 .../packet/game/DestroyMessage.scala | 0 .../packet/game/DisconnectMessage.scala | 0 .../packet/game/DismountBuildingMsg.scala | 0 .../packet/game/DismountVehicleCargoMsg.scala | 0 .../packet/game/DismountVehicleMsg.scala | 0 .../packet/game/DisplayedAwardMessage.scala | 0 .../packet/game/DropItemMessage.scala | 0 .../game/DroppodFreefallingMessage.scala | 0 .../net/psforever/packet/game/EmoteMsg.scala | 0 .../packet/game/ExperienceAddedMessage.scala | 0 ...ityBenefitShieldChargeRequestMessage.scala | 0 .../packet/game/FavoritesMessage.scala | 0 .../packet/game/FavoritesRequest.scala | 0 .../packet/game/FireHintMessage.scala | 0 .../packet/game/FriendsRequest.scala | 0 .../packet/game/FriendsResponse.scala | 0 .../packet/game/GenericActionMessage.scala | 0 .../packet/game/GenericCollisionMsg.scala | 0 .../game/GenericObjectActionMessage.scala | 0 .../packet/game/GenericObjectStateMsg.scala | 0 .../psforever/packet/game/HackMessage.scala | 0 .../net/psforever/packet/game/HitHint.scala | 0 .../psforever/packet/game/HitMessage.scala | 0 .../packet/game/HotSpotUpdateMessage.scala | 0 .../packet/game/InventoryStateMessage.scala | 0 .../packet/game/ItemTransactionMessage.scala | 0 .../game/ItemTransactionResultMessage.scala | 0 .../packet/game/KeepAliveMessage.scala | 0 .../psforever/packet/game/LashMessage.scala | 0 .../packet/game/LoadMapMessage.scala | 0 .../psforever/packet/game/LoginMessage.scala | 0 .../packet/game/LoginRespMessage.scala | 0 .../packet/game/LootItemMessage.scala | 0 .../psforever/packet/game/MailMessage.scala | 0 .../packet/game/MountVehicleCargoMsg.scala | 0 .../packet/game/MountVehicleMsg.scala | 0 .../packet/game/MoveItemMessage.scala | 0 .../packet/game/ObjectAttachMessage.scala | 0 .../game/ObjectCreateDetailedMessage.scala | 0 .../packet/game/ObjectCreateMessage.scala | 0 .../packet/game/ObjectDeleteMessage.scala | 0 .../packet/game/ObjectDeployedMessage.scala | 0 .../packet/game/ObjectDetachMessage.scala | 0 .../packet/game/ObjectDetectedMessage.scala | 0 .../packet/game/ObjectHeldMessage.scala | 0 .../game/OrbitalStrikeWaypointMessage.scala | 0 .../packet/game/OxygenStateMessage.scala | 0 .../packet/game/PickupItemMessage.scala | 0 .../net/psforever/packet/game/PingMsg.scala | 0 .../game/PlanetsideAttributeMessage.scala | 0 .../PlanetsideStringAttributeMessage.scala | 0 .../packet/game/PlayerStasisMessage.scala | 0 .../packet/game/PlayerStateMessage.scala | 0 .../game/PlayerStateMessageUpstream.scala | 0 .../packet/game/PlayerStateShiftMessage.scala | 0 .../packet/game/ProjectileStateMessage.scala | 0 .../packet/game/PropertyOverrideMessage.scala | 0 .../game/ProximityTerminalUseMessage.scala | 0 .../game/QuantityDeltaUpdateMessage.scala | 0 .../packet/game/QuantityUpdateMessage.scala | 0 .../game/ReleaseAvatarRequestMessage.scala | 0 .../psforever/packet/game/ReloadMessage.scala | 0 .../psforever/packet/game/RepairMessage.scala | 0 .../game/ReplicationStreamMessage.scala | 0 .../packet/game/RequestDestroyMessage.scala | 0 .../packet/game/RespawnAMSInfoMessage.scala | 0 .../game/ServerVehicleOverrideMsg.scala | 0 .../packet/game/SetChatFilterMessage.scala | 0 .../packet/game/SetCurrentAvatarMessage.scala | 0 .../packet/game/SetEmpireMessage.scala | 0 .../packet/game/SimDataChallenge.scala | 0 .../packet/game/SimDataChallengeResp.scala | 0 .../packet/game/SpawnRequestMessage.scala | 0 .../packet/game/SplashHitMessage.scala | 0 .../game/SquadDefinitionActionMessage.scala | 0 .../SquadDetailDefinitionUpdateMessage.scala | 0 .../game/SquadInvitationRequestMessage.scala | 0 .../packet/game/SquadMemberEvent.scala | 0 .../packet/game/SquadMembershipRequest.scala | 0 .../packet/game/SquadMembershipResponse.scala | 0 .../psforever/packet/game/SquadState.scala | 0 .../packet/game/SquadWaypointEvent.scala | 0 .../packet/game/SquadWaypointRequest.scala | 0 .../packet/game/TargetingImplantRequest.scala | 0 .../packet/game/TargetingInfoMessage.scala | 0 .../packet/game/TimeOfDayMessage.scala | 0 .../packet/game/TrainingZoneMessage.scala | 0 .../packet/game/TriggerEffectMessage.scala | 0 .../TriggerEnvironmentalDamageMessage.scala | 0 .../packet/game/TriggerSoundMessage.scala | 0 .../packet/game/UnuseItemMessage.scala | 0 .../packet/game/UseItemMessage.scala | 0 .../packet/game/VNLWorldStatusMessage.scala | 0 .../packet/game/VehicleStateMessage.scala | 0 .../packet/game/VehicleSubStateMessage.scala | 0 .../psforever/packet/game/VoiceHostInfo.scala | 0 .../psforever/packet/game/VoiceHostKill.scala | 0 .../packet/game/VoiceHostRequest.scala | 0 .../packet/game/WarpgateRequest.scala | 0 .../packet/game/WeaponDelayFireMessage.scala | 0 .../packet/game/WeaponDryFireMessage.scala | 0 .../packet/game/WeaponFireMessage.scala | 0 .../packet/game/WeaponJammedMessage.scala | 0 .../WeaponLazeTargetPositionMessage.scala | 0 .../packet/game/WeatherMessage.scala | 0 .../packet/game/ZipLineMessage.scala | 0 .../ZoneForcedCavernConnectionsMessage.scala | 0 .../packet/game/ZoneInfoMessage.scala | 0 .../packet/game/ZoneLockInfoMessage.scala | 0 .../game/ZonePopulationUpdateMessage.scala | 0 .../AegisShieldGeneratorData.scala | 0 .../game/objectcreate/AmmoBoxData.scala | 0 .../objectcreate/BasicCharacterData.scala | 0 .../game/objectcreate/CaptureFlagData.scala | 0 .../CharacterAppearanceData.scala | 0 .../game/objectcreate/CharacterData.scala | 0 .../game/objectcreate/CommonFieldData.scala | 0 .../CommonFieldDataWithPlacement.scala | 0 .../game/objectcreate/ConstructorData.scala | 0 .../objectcreate/DestroyedVehicleData.scala | 0 .../objectcreate/DetailedAmmoBoxData.scala | 0 .../objectcreate/DetailedCharacterData.scala | 0 .../DetailedCommandDetonaterData.scala | 0 .../DetailedConstructionToolData.scala | 0 .../DetailedLockerContainerData.scala | 0 .../objectcreate/DetailedPlayerData.scala | 0 .../game/objectcreate/DetailedREKData.scala | 0 .../objectcreate/DetailedWeaponData.scala | 0 .../packet/game/objectcreate/DrawnSlot.scala | 0 .../game/objectcreate/DroppedItemData.scala | 0 .../game/objectcreate/DroppodData.scala | 0 .../game/objectcreate/HandheldData.scala | 0 .../game/objectcreate/InternalSlot.scala | 0 .../game/objectcreate/InventoryData.scala | 0 .../game/objectcreate/InventoryItemData.scala | 0 .../objectcreate/LargeDeployableData.scala | 0 .../objectcreate/LockerContainerData.scala | 0 .../packet/game/objectcreate/MountItem.scala | 0 .../game/objectcreate/ObjectClass.scala | 9 +- .../game/objectcreate/ObjectCreateBase.scala | 0 .../OneMannedFieldTurretData.scala | 0 .../objectcreate/OrbitalShuttleData.scala | 0 .../game/objectcreate/PlacementData.scala | 0 .../packet/game/objectcreate/PlayerData.scala | 0 .../packet/game/objectcreate/Prefab.scala | 0 .../packet/game/objectcreate/REKData.scala | 0 .../objectcreate/RemoteProjectileData.scala | 0 .../packet/game/objectcreate/RibbonBars.scala | 0 .../game/objectcreate/SmallTurretData.scala | 0 .../game/objectcreate/StreamBitSize.scala | 0 .../packet/game/objectcreate/TRAPData.scala | 0 .../objectcreate/TelepadDeployableData.scala | 0 .../game/objectcreate/TerminalData.scala | 0 .../game/objectcreate/VehicleData.scala | 0 .../packet/game/objectcreate/WeaponData.scala | 0 .../net/psforever/persistence/Account.scala | 0 .../net/psforever/persistence/Avatar.scala | 0 .../net/psforever/persistence/Building.scala | 0 .../psforever/persistence/Certification.scala | 0 .../net/psforever/persistence/Implant.scala | 0 .../net/psforever/persistence/Loadout.scala | 0 .../net/psforever/persistence/Locker.scala | 0 .../net/psforever/persistence/Login.scala | 0 .../services/InterstellarClusterService.scala | 2 +- .../psforever}/services/RemoverActor.scala | 4 +- .../net/psforever}/services/Service.scala | 3 +- .../psforever}/services/ServiceManager.scala | 2 +- .../account/AccountIntermediaryService.scala | 2 +- .../account/AccountPersistenceService.scala | 8 +- .../services/account/IPAddress.scala | 14 + .../services/account/ReceiveAccountData.scala | 2 +- .../services/account/ReceiveIPAddress.scala | 2 +- .../account/RetrieveAccountData.scala | 2 +- .../services/account/RetrieveIPAddress.scala | 2 +- .../services/account/StoreAccountData.scala | 2 +- .../services/account/StoreIPAddress.scala | 2 +- .../services/avatar/AvatarService.scala | 6 +- .../avatar/AvatarServiceMessage.scala | 2 +- .../avatar/AvatarServiceResponse.scala | 4 +- .../avatar/support/CorpseRemovalActor.scala | 6 +- .../avatar/support/DroppedItemRemover.scala | 6 +- .../services/chat/ChatService.scala | 2 +- .../services/galaxy/GalaxyService.scala | 4 +- .../galaxy/GalaxyServiceMessage.scala | 2 +- .../galaxy/GalaxyServiceResponse.scala | 4 +- .../services/local/LocalService.scala | 10 +- .../services/local/LocalServiceMessage.scala | 2 +- .../services/local/LocalServiceResponse.scala | 4 +- .../local/support/DeployableRemover.scala | 4 +- .../local/support/DoorCloseActor.scala | 2 +- .../local/support/HackCaptureActor.scala | 2 +- .../local/support/HackClearActor.scala | 2 +- .../support/RouterTelepadActivation.scala | 4 +- .../properties/PropertyOverrideManager.scala | 2 +- .../support/SimilarityComparator.scala | 3 +- .../services/support/SupportActor.scala | 5 +- .../support/SupportActorCaseConversions.scala | 5 +- .../services/teamwork/SquadService.scala | 4 +- .../teamwork/SquadServiceMessage.scala | 3 +- .../teamwork/SquadServiceResponse.scala | 4 +- .../services/teamwork/SquadSwitchboard.scala | 2 +- .../services/vehicle/VehicleService.scala | 6 +- .../vehicle/VehicleServiceMessage.scala | 2 +- .../vehicle/VehicleServiceResponse.scala | 4 +- .../vehicle/support/TurretUpgrader.scala | 8 +- .../vehicle/support/VehicleRemover.scala | 4 +- .../scala/net/psforever/types/Angular.scala | 0 .../scala/net/psforever/types/BailType.scala | 0 .../psforever/types/CapacitorStateType.scala | 0 .../net/psforever/types/CargoStatus.scala | 0 .../net/psforever/types/CharacterGender.scala | 0 .../net/psforever/types/CharacterVoice.scala | 0 .../net/psforever/types/ChatMessageType.scala | 0 .../net/psforever/types/DriveState.scala | 0 .../scala/net/psforever/types/EmoteType.scala | 0 .../net/psforever/types/ExoSuitType.scala | 0 .../net/psforever/types/GrenadeState.scala | 0 .../net/psforever/types/ImplantType.scala | 0 .../net/psforever/types/LoadoutType.scala | 0 .../psforever/types/MeritCommendation.scala | 0 .../psforever/types/PlanetSideEmpire.scala | 0 .../net/psforever/types/PlanetSideGUID.scala | 0 .../types/PlanetSideGeneratorState.scala | 0 .../net/psforever/types/SpawnGroup.scala | 0 .../psforever/types/SquadRequestType.scala | 0 .../psforever/types/SquadResponseType.scala | 0 .../net/psforever/types/SquadWaypoints.scala | 0 .../net/psforever/types/TransactionType.scala | 0 .../scala/net/psforever/types/Vector3.scala | 0 .../scala/net/psforever/util/Config.scala | 0 .../scala/net/psforever/util/Database.scala | 0 .../net/psforever/util/DefinitionUtil.scala | 0 .../net/psforever/util/PointOfInterest.scala | 0 .../scala/net/psforever/zones/Zones.scala | 0 .../scala/scodec/interop/akka/package.scala | 0 .../src => src}/main/scala/sna/Library.scala | 0 .../test/resources/logback-test.xml | 0 .../src => src}/test/scala/CodecTest.scala | 0 .../test/scala/CryptoInterfaceTest.scala | 0 .../test/scala/CryptoPacketTest.scala | 0 .../test/scala/PacketCodingTest.scala | 0 .../src => src}/test/scala/Vector3Test.scala | 0 .../test/scala/base/ActorTest.scala | 0 .../scala/base/FreedContextActorTest.scala | 0 .../test/scala/control/ClientStartTest.scala | 0 .../scala/control/ConnectionCloseTest.scala | 0 .../scala/control/ControlSyncRespTest.scala | 0 .../test/scala/control/ControlSyncTest.scala | 0 .../scala/control/HandleGamePacketTest.scala | 0 .../control/MultiPacketCollectorTest.scala | 0 .../scala/control/MultiPacketExTest.scala | 0 .../test/scala/control/MultiPacketTest.scala | 0 .../test/scala/control/RelatedATest.scala | 0 .../test/scala/control/RelatedBTest.scala | 0 .../scala/control/SlottedMetaPacketTest.scala | 0 .../control/TeardownConnectionTest.scala | 0 .../scala/game/ActionCancelMessageTest.scala | 0 .../game/ActionProgressMessageTest.scala | 0 .../scala/game/ActionResultMessageTest.scala | 0 .../scala/game/ArmorChangedMessageTest.scala | 0 .../game/AvatarDeadStateMessageTest.scala | 0 .../AvatarFirstTimeEventMessageTest.scala | 0 .../game/AvatarGrenadeStateMessageTest.scala | 0 .../scala/game/AvatarImplantMessageTest.scala | 0 .../scala/game/AvatarJumpMessageTest.scala | 0 .../AvatarSearchCriteriaMessageTest.scala | 0 .../game/AvatarStatisticsMessageTest.scala | 0 .../game/AvatarVehicleTimerMessageTest.scala | 0 .../game/BattleExperienceMessageTest.scala | 0 .../scala/game/BattleplanMessageTest.scala | 0 .../scala/game/BeginZoningMessageTest.scala | 0 .../scala/game/BindPlayerMessageTest.scala | 0 .../BroadcastWarpgateUpdateMessageTest.scala | 0 .../scala/game/BugReportMessageTest.scala | 0 .../game/BuildingInfoUpdateMessageTest.scala | 0 .../scala/game/ChainLashMessageTest.scala | 0 .../scala/game/ChangeAmmoMessageTest.scala | 0 .../game/ChangeFireModeMessageTest.scala | 0 .../ChangeFireStateMessage_StartTest.scala | 0 .../ChangeFireStateMessage_StopTest.scala | 0 .../game/ChangeShortcutBankMessageTest.scala | 0 .../CharacterCreateRequestMessageTest.scala | 0 .../scala/game/CharacterInfoMessageTest.scala | 0 .../game/CharacterKnowledgeMessageTest.scala | 0 .../game/CharacterNoRecordMessageTest.scala | 0 .../game/CharacterRequestMessageTest.scala | 0 .../test/scala/game/ChatMsgTest.scala | 0 .../game/ChildObjectStateMessageTest.scala | 0 .../game/ConnectToWorldMessageTest.scala | 0 .../ConnectToWorldRequestMessageTest.scala | 0 .../ContinentalLockUpdateMessageTest.scala | 0 .../game/CreateShortcutMessageTest.scala | 0 .../game/DamageFeedbackMessageTest.scala | 0 .../test/scala/game/DamageMessageTest.scala | 0 .../game/DamageWithPositionMessageTest.scala | 0 .../game/DataChallengeMessageRespTest.scala | 0 .../scala/game/DataChallengeMessageTest.scala | 0 .../scala/game/DelayedPathMountMsgTest.scala | 0 .../game/DensityLevelUpdateMessageTest.scala | 0 .../scala/game/DeployObjectMessageTest.scala | 0 .../scala/game/DeployRequestMessageTest.scala | 0 .../DeployableObjectsInfoMessageTest.scala | 0 .../game/DestroyDisplayMessageTest.scala | 0 .../test/scala/game/DestroyMessageTest.scala | 0 .../scala/game/DisconnectMessageTest.scala | 0 .../scala/game/DismountBuildingMsgTest.scala | 0 .../scala/game/DismountVehicleMsgTest.scala | 0 .../game/DisplayedAwardMessageTest.scala | 0 .../test/scala/game/DropItemMessageTest.scala | 0 .../game/DroppodFreefallingMessageTest.scala | 0 .../test/scala/game/EmoteMsgTest.scala | 0 .../game/ExperienceAddedMessageTest.scala | 0 ...enefitShieldChargeRequestMessageTest.scala | 0 .../scala/game/FavoritesMessageTest.scala | 0 .../scala/game/FavoritesRequestTest.scala | 0 .../test/scala/game/FireHintMessageTest.scala | 0 .../test/scala/game/FriendsRequestTest.scala | 0 .../test/scala/game/FriendsResponseTest.scala | 0 .../scala/game/GenericActionMessageTest.scala | 0 .../scala/game/GenericCollisionMsgTest.scala | 0 .../game/GenericObjectActionMessageTest.scala | 0 .../game/GenericObjectStateMsgTest.scala | 0 .../test/scala/game/HackMessageTest.scala | 0 .../test/scala/game/HitHintTest.scala | 0 .../test/scala/game/HitMessageTest.scala | 0 .../scala/game/HotSpotUpdateMessageTest.scala | 0 .../game/InventoryStateMessageTest.scala | 0 .../game/ItemTransactionMessageTest.scala | 0 .../ItemTransactionResultMessageTest.scala | 0 .../scala/game/KeepAliveMessageTest.scala | 0 .../test/scala/game/LashMessageTest.scala | 0 .../test/scala/game/LoadMapMessageTest.scala | 0 .../test/scala/game/LoginMessageTest.scala | 0 .../scala/game/LoginRespMessageTest.scala | 0 .../test/scala/game/LootItemMessageTest.scala | 0 .../test/scala/game/MailMessageTest.scala | 0 .../test/scala/game/MountVehicleMsgTest.scala | 0 .../test/scala/game/MoveItemMessageTest.scala | 0 .../scala/game/ObjectAttachMessageTest.scala | 0 .../scala/game/ObjectDeleteMessageTest.scala | 0 .../game/ObjectDeployedMessageTest.scala | 0 .../scala/game/ObjectDetachMessageTest.scala | 0 .../game/ObjectDetectedMessageTest.scala | 0 .../scala/game/ObjectHeldMessageTest.scala | 0 .../OrbitalStrikeWaypointMessageTest.scala | 0 .../scala/game/OxygenStateMessageTest.scala | 0 .../scala/game/PickupItemMessageTest.scala | 0 .../test/scala/game/PingMsgTest.scala | 0 .../game/PlanetsideAttributeMessageTest.scala | 0 ...PlanetsideStringAttributeMessageTest.scala | 0 .../scala/game/PlayerStasisMessageTest.scala | 0 .../scala/game/PlayerStateMessageTest.scala | 0 .../game/PlayerStateMessageUpstreamTest.scala | 0 .../game/PlayerStateShiftMessageTest.scala | 0 .../game/ProjectileStateMessageTest.scala | 0 .../game/PropertyOverrideMessageTest.scala | 0 .../ProximityTerminalUseMessageTest.scala | 0 .../game/QuantityDeltaUpdateMessageTest.scala | 0 .../game/QuantityUpdateMessageTest.scala | 0 .../ReleaseAvatarRequestMessageTest.scala | 0 .../test/scala/game/ReloadMessageTest.scala | 0 .../test/scala/game/RepairMessageTest.scala | 0 .../game/ReplicationStreamMessageTest.scala | 0 .../game/RequestDestroyMessageTest.scala | 0 .../game/ServerVehicleOverrideMsgTest.scala | 0 .../scala/game/SetChatFilterMessageTest.scala | 0 .../scala/game/SetEmpireMessageTest.scala | 0 .../scala/game/SimDataChallengeRespTest.scala | 0 .../scala/game/SimDataChallengeTest.scala | 0 .../scala/game/SpawnRequestMessageTest.scala | 0 .../scala/game/SplashHitMessageTest.scala | 0 .../SquadDefinitionActionMessageTest.scala | 0 ...uadDetailDefinitionUpdateMessageTest.scala | 0 .../scala/game/SquadMemberEventTest.scala | 0 .../game/SquadMembershipRequestTest.scala | 0 .../game/SquadMembershipResponseTest.scala | 0 .../test/scala/game/SquadStateTest.scala | 0 .../scala/game/SquadWaypointEventTest.scala | 0 .../game/TargetingImplantRequestTest.scala | 0 .../scala/game/TargetingInfoMessageTest.scala | 0 .../scala/game/TimeOfDayMessageTest.scala | 0 .../scala/game/TrainingZoneMessageTest.scala | 0 .../scala/game/TriggerEffectMessageTest.scala | 0 ...riggerEnvironmentalDamageMessageTest.scala | 0 .../scala/game/TriggerSoundMessageTest.scala | 0 .../scala/game/UnuseItemMessageTest.scala | 0 .../test/scala/game/UseItemMessageTest.scala | 0 .../game/VNLWorldStatusMessageTest.scala | 0 .../scala/game/VehicleStateMessageTest.scala | 0 .../game/VehicleSubStateMessageTest.scala | 0 .../test/scala/game/VoiceHostInfoTest.scala | 0 .../test/scala/game/VoiceHostKillTest.scala | 0 .../scala/game/VoiceHostRequestTest.scala | 0 .../test/scala/game/WarpgateRequestTest.scala | 0 .../game/WeaponDelayFireMessageTest.scala | 0 .../scala/game/WeaponDryFireMessageTest.scala | 0 .../scala/game/WeaponFireMessageTest.scala | 0 .../scala/game/WeaponJammedMessageTest.scala | 0 .../WeaponLazeTargetPositionMessageTest.scala | 0 .../test/scala/game/WeatherMessageTest.scala | 0 .../test/scala/game/ZipLineMessageTest.scala | 0 ...neForcedCavernConnectionsMessageTest.scala | 0 .../test/scala/game/ZoneInfoMessageTest.scala | 0 .../scala/game/ZoneLockInfoMesageTest.scala | 0 .../ZonePopulationUpdateMessageTest.scala | 0 .../AegisShieldGeneratorDataTest.scala | 0 .../objectcreate/CaptureFlagDataTest.scala | 0 .../game/objectcreate/CharacterDataTest.scala | 0 .../objectcreate/CommonFieldDataTest.scala | 0 .../CommonFieldDataWithPlacementTest.scala | 0 .../game/objectcreate/HandheldDataTest.scala | 0 .../LockerContainerDataTest.scala | 0 .../OneMannedFieldTurretDataTest.scala | 0 .../scala/game/objectcreate/REKDataTest.scala | 0 .../RemoteProjectileDataTest.scala | 0 .../game/objectcreate/RibbonBarsTest.scala | 0 .../objectcreate/SmallTurretDataTest.scala | 0 .../game/objectcreate/TRAPDataTest.scala | 0 .../TelepadDeployableDataTest.scala | 0 .../game/objectcreate/WeaponDataTest.scala | 0 .../DetailedAmmoBoxDataTest.scala | 0 .../DetailedCharacterDataTest.scala | 0 .../DetailedCommandDetonaterDataTest.scala | 0 .../DetailedConstructionToolDataTest.scala | 0 .../DetailedREKDataTest.scala | 0 .../DetailedWeaponDataTest.scala | 0 .../DestroyedVehiclesTest.scala | 0 .../MountedVehiclesTest.scala | 0 .../NonstandardVehiclesTest.scala | 0 .../NormalVehiclesTest.scala | 0 .../UtilityVehiclesTest.scala | 0 .../VariantVehiclesTest.scala | 0 .../test/scala/objects/AvatarTest.scala | 0 .../test/scala/objects/BuildingTest.scala | 0 .../test/scala/objects/ContainerTest.scala | 0 .../test/scala/objects/ConverterTest.scala | 0 .../test/scala/objects/DamageModelTests.scala | 0 .../test/scala/objects/DamageableTest.scala | 10 +- .../test/scala/objects/DefaultTest.scala | 0 .../test/scala/objects/DeployableTest.scala | 8 +- .../scala/objects/DeployableToolboxTest.scala | 0 .../test/scala/objects/DeploymentTest.scala | 68 +++-- .../test/scala/objects/DoorTest.scala | 0 .../test/scala/objects/EntityTest.scala | 0 .../scala/objects/EquipmentSlotTest.scala | 0 .../test/scala/objects/EquipmentTest.scala | 0 .../test/scala/objects/ExoSuitTest.scala | 0 .../scala/objects/FacilityTurretTest.scala | 4 +- .../scala/objects/FactionAffinityTest.scala | 0 .../test/scala/objects/FireModeTest.scala | 0 .../test/scala/objects/GeneratorTest.scala | 2 +- .../test/scala/objects/IFFLockTest.scala | 0 .../test/scala/objects/InventoryTest.scala | 0 .../test/scala/objects/LoadoutTest.scala | 0 .../test/scala/objects/LockerTest.scala | 0 .../test/scala/objects/MountableTest.scala | 0 .../scala/objects/PlayerControlTest.scala | 4 +- .../test/scala/objects/PlayerTest.scala | 0 .../test/scala/objects/ProjectileTest.scala | 0 .../test/scala/objects/RepairableTest.scala | 4 +- .../test/scala/objects/ResourceSiloTest.scala | 4 +- .../objects/ServerObjectBuilderTest.scala | 0 .../test/scala/objects/SpawnTubeTest.scala | 0 .../test/scala/objects/UtilityTest.scala | 0 .../scala/objects/VehicleSpawnPadTest.scala | 0 .../test/scala/objects/VehicleTest.scala | 4 +- .../test/scala/objects/VitalityTest.scala | 0 .../test/scala/objects/ZoneTest.scala | 0 .../guidtask/GUIDTaskRegisterAmmoTest.scala | 0 .../guidtask/GUIDTaskRegisterAvatarTest.scala | 0 .../guidtask/GUIDTaskRegisterObjectTest.scala | 0 .../guidtask/GUIDTaskRegisterPlayerTest.scala | 0 .../guidtask/GUIDTaskRegisterToolTest.scala | 0 .../guidtask/GUIDTaskRegisterTurretTest.scala | 0 .../GUIDTaskRegisterVehicleTest.scala | 0 .../scala/objects/guidtask/GUIDTaskTest.scala | 0 .../guidtask/GUIDTaskUnregisterAmmoTest.scala | 0 .../GUIDTaskUnregisterAvatarTest.scala | 0 .../GUIDTaskUnregisterObjectTest.scala | 0 .../GUIDTaskUnregisterPlayerTest.scala | 0 .../guidtask/GUIDTaskUnregisterToolTest.scala | 0 .../GUIDTaskUnregisterTurretTest.scala | 0 .../GUIDTaskUnregisterVehicleTest.scala | 0 .../objects/number/NumberPoolActorTest.scala | 0 .../objects/number/NumberPoolHubTest.scala | 0 .../scala/objects/number/NumberPoolTest.scala | 0 .../objects/number/NumberSelectorTest.scala | 0 .../objects/number/NumberSourceTest.scala | 0 .../scala/objects/number/RegisterTest.scala | 0 .../number/UniqueNumberSystemTest.scala | 0 .../terminal/ImplantTerminalMechTest.scala | 0 .../objects/terminal/MatrixTerminalTest.scala | 0 .../objects/terminal/OrderTerminalTest.scala | 0 .../objects/terminal/ProximityTest.scala | 4 +- .../terminal/TerminalControlTest.scala | 0 .../test/scala/service/LocalServiceTest.scala | 4 +- .../test/scala/service/RemoverActorTest.scala | 4 +- .../service/RouterTelepadActivationTest.scala | 4 +- .../scala/service/VehicleServiceTest.scala | 4 +- .../tools/decodePackets}/DecodePackets.scala | 48 +-- .../src/main/scala/xtoolspar.scala | 274 ------------------ 958 files changed, 527 insertions(+), 725 deletions(-) delete mode 100644 common/src/main/scala/services/account/IPAddress.scala rename {pslogin => server}/src/main/resources/db/migration/V001__Init.sql (100%) rename {pslogin => server}/src/main/resources/db/migration/V002__Buildings.sql (100%) rename {pslogin => server}/src/main/resources/db/migration/V003__Avatar.sql (100%) rename {pslogin => server}/src/main/resources/overrides/game_objects0.adb.lst (100%) rename {pslogin => server}/src/main/resources/overrides/game_objects29.adb.lst (100%) rename {pslogin => server}/src/main/resources/overrides/game_objects30.adb.lst (100%) rename {pslogin => server}/src/main/resources/overrides/game_objects31.adb.lst (100%) rename {pslogin => server}/src/main/resources/overrides/game_objects32.adb.lst (100%) rename pslogin/src/main/scala/PsLogin.scala => server/src/main/scala/net/psforever/server/Server.scala (94%) rename {common => server}/src/test/resources/logback-test.xml (100%) rename {pslogin => server}/src/test/resources/testconfig.ini (100%) rename {pslogin => server}/src/test/scala/MDCTestProbe.scala (100%) rename {pslogin => server}/src/test/scala/PacketCodingActorTest.scala (100%) rename {pslogin => server}/src/test/scala/actor/base/ActorTest.scala (100%) rename {pslogin => server}/src/test/scala/actor/objects/VehicleSpawnPadTest.scala (99%) rename {pslogin => server}/src/test/scala/actor/service/AvatarServiceTest.scala (99%) rename {common/src => src}/main/java/scodec/interop/akka/PrivacyHelper.java (100%) rename {common/src => src}/main/resources/akka.conf (100%) rename {common/src => src}/main/resources/application.conf (97%) rename {common/src => src}/main/resources/dispatchers.conf (100%) rename {common/src => src}/main/resources/zonemaps/lattice.json (100%) rename {common/src => src}/main/resources/zonemaps/map01.json (100%) rename {common/src => src}/main/resources/zonemaps/map02.json (100%) rename {common/src => src}/main/resources/zonemaps/map03.json (100%) rename {common/src => src}/main/resources/zonemaps/map04.json (100%) rename {common/src => src}/main/resources/zonemaps/map05.json (100%) rename {common/src => src}/main/resources/zonemaps/map06.json (100%) rename {common/src => src}/main/resources/zonemaps/map07.json (100%) rename {common/src => src}/main/resources/zonemaps/map08.json (100%) rename {common/src => src}/main/resources/zonemaps/map09.json (100%) rename {common/src => src}/main/resources/zonemaps/map10.json (100%) rename {common/src => src}/main/resources/zonemaps/map11.json (100%) rename {common/src => src}/main/resources/zonemaps/map12.json (100%) rename {common/src => src}/main/resources/zonemaps/map13.json (100%) rename {common/src => src}/main/resources/zonemaps/map96.json (100%) rename {common/src => src}/main/resources/zonemaps/map97.json (100%) rename {common/src => src}/main/resources/zonemaps/map98.json (100%) rename {common/src => src}/main/resources/zonemaps/map99.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd01.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd02.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd03.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd04.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd05.json (100%) rename {common/src => src}/main/resources/zonemaps/ugd06.json (100%) rename {common/src => src}/main/scala/akka/actor/MDCContextAware.scala (100%) rename {common/src => src}/main/scala/akka/actor/MDCPropagatingExecutionContext.scala (100%) rename {common/src => src}/main/scala/net/psforever/IFinalizable.scala (100%) rename {common/src => src}/main/scala/net/psforever/actors/commands/NtuCommand.scala (100%) rename {common/src => src}/main/scala/net/psforever/actors/session/AvatarActor.scala (99%) rename {common/src => src}/main/scala/net/psforever/actors/session/ChatActor.scala (99%) rename {common/src => src}/main/scala/net/psforever/actors/session/SessionActor.scala (99%) rename {common/src => src}/main/scala/net/psforever/actors/zone/BuildingActor.scala (96%) rename {common/src => src}/main/scala/net/psforever/actors/zone/ZoneActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/crypto/CryptoInterface.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/CryptoSessionActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/LoginSessionActor.scala (98%) rename {common/src => src}/main/scala/net/psforever/login/PacketCodingActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/Session.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/SessionRouter.scala (94%) rename {common/src => src}/main/scala/net/psforever/login/TcpListener.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/UdpListener.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/UdpNetworkSimulator.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/WorldSession.scala (99%) rename {common/src => src}/main/scala/net/psforever/login/psadmin/CmdInternal.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala (94%) rename {common/src => src}/main/scala/net/psforever/login/psadmin/CmdShutdown.scala (100%) rename {common/src => src}/main/scala/net/psforever/login/psadmin/PsAdminActor.scala (98%) rename {common/src => src}/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala (91%) rename {common/src => src}/main/scala/net/psforever/newcodecs/BinaryChoiceCodec.scala (100%) rename {common/src => src}/main/scala/net/psforever/newcodecs/PrefixedVectorCodec.scala (100%) rename {common/src => src}/main/scala/net/psforever/newcodecs/QuantizedDoubleCodec.scala (100%) rename {common/src => src}/main/scala/net/psforever/newcodecs/package.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Account.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/AmmoBox.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/BoomerDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/BoomerTrigger.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ConstructionItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Default.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Deployables.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/ExplosiveDeployable.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/GlobalDefinitions.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Kit.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/LivePlayerList.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/LocalProjectile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/LockerContainer.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/Ntu.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ObjectType.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/OffhandEquipmentSlot.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/OwnableByPlayer.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/PlanetSideGameObject.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Player.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Players.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/SensorDeployable.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/Session.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/SimpleItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/SpawnPoint.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Telepad.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/TelepadDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Tool.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/TrapDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/TurretDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Vehicle.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/Vehicles.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/Avatar.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/Avatars.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/BattleRank.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/Certification.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/CommandRank.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/CorpseControl.scala (95%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/Cosmetic.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/FirstTimeEvents.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/Implant.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/LoadoutManager.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/avatar/PlayerControl.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/ComplexDeployableSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/DeployableSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/ObjectSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/PlayerSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/Projectile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/Projectiles.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/ResolvedProjectile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/SourceEntry.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/VehicleSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/ComplexDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/Deployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/DeployableCategory.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/DeployedItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/SimpleDeployable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ce/TelepadLike.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/AmmoBoxDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/AvatarDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/BasicDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/CargoDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ConstructionItemDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/EquipmentDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ImplantDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/KitDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ObjectDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ProjectileDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/SeatDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/SimpleDeployableDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/SimpleItemDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/ToolDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/VehicleDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/DestroyedVehicleConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/DroppodConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/KitConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/PacketConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/REKConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/SeatConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/SpawnTubeConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/StatConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/TerminalConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/entity/GUIDException.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/entity/Identifiable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/entity/SimpleWorldEntity.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/entity/WorldEntity.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/Ammo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/CItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/EffectTarget.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/Equipment.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/EquipmentSize.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/EquipmentSlot.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/FireModeDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/FireModeSwitch.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/JammingUnit.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/Kits.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/RemoteUnit.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/equipment/SItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/AvailabilityPolicy.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/GUIDTask.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/NumberPoolHub.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/Task.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/TaskResolver.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/actor/NumberPoolActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/actor/Register.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/actor/UniqueNumberSystem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/actor/Unregister.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/key/LoanedKey.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/key/Monitor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/key/SecureKey.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/pool/ExclusivePool.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/pool/GenericPool.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/pool/NumberPool.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/pool/SimplePool.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/NumberSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/OpportunisticSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/RandomSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/RandomSequenceSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/SpecificSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/selector/StrictInOrderSelector.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/source/Key.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/source/LimitedNumberSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/guid/source/NumberSource.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/Container.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/GridInventory.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/InventoryDisarrayException.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/InventoryEquipmentSlot.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/InventoryItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/inventory/InventoryTile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/loadouts/EquipmentLoadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/loadouts/InfantryLoadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/loadouts/Loadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/loadouts/SquadLoadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/loadouts/VehicleLoadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/CommonMessages.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/PlanetSideServerObject.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/ServerObjectBuilder.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinity.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinityBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/Damageable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala (92%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/deploy/Deployment.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/doors/Door.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/doors/DoorControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/doors/DoorDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/generator/Generator.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/generator/GeneratorDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala (95%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/hackable/HackableBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/hackable/HackableDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMech.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/locks/IFFLock.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/locks/IFFLockControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/locks/IFFLockDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala (81%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/mblocker/LockerControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/mblocker/LockerDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/mount/Mountable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/mount/MountableBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPadDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlBase.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlConcealPlayer.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlDriverControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlLoadVehicle.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlSeatDriver.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlServerVehicleOverride.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/painbox/Painbox.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/painbox/PainboxDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/repair/Repairable.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala (94%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/repair/RepairableVehicle.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala (93%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSilo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/Amenity.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/AmenityDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/AmenityOwner.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/Building.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/BuildingDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/FoundationBuilder.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/SphereOfInfluence.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/StructureType.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/structures/WarpGate.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminal.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/EquipmentTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/GeneratorTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ImplantTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/MatrixTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/MedicalTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/OrderTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ProximityDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala (92%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/ProximityUnit.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/TerminalControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/TerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/terminals/VehicleTerminalDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/transfer/TransferBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/transfer/TransferContainer.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/tube/SpawnTube.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeControl.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/TurretDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/TurretUpgrade.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala (84%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/zipline/ZipLinePath.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/teamwork/Member.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/teamwork/Squad.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala (97%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/AccessPermissionGroup.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/Cargo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/CargoVehicleRestriction.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/DestroyedVehicle.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/MountedWeapons.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/Seat.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/SeatArmorRestriction.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/Turrets.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/Utility.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/VehicleControl.scala (98%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vehicles/VehicleManifest.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/DamageType.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/StandardDamageProfile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/StandardResistances.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/StandardResolutions.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/Vitality.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/VitalityDefinition.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/VitalsHistory.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/damage/DamageCalculations.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resolution/DamageResistCalculations.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/vital/resolution/ResolutionSelection.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/HotSpotInfo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/MapInfo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/MapScale.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/Zone.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneAware.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala (96%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala (99%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneInfo.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneMap.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/zones/Zoning.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/ControlPacketOpcode.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/CryptoPacketOpcode.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/GamePacketOpcode.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/PSPacket.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/PacketCoding.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/ClientStart.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/ConnectionClose.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/ControlSync.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/ControlSyncResp.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/HandleGamePacket.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/MultiPacket.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/MultiPacketCollector.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/MultiPacketEx.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/RelatedA.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/RelatedB.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/ServerStart.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/control/TeardownConnection.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala (94%) rename {common/src => src}/main/scala/net/psforever/packet/crypto/ClientFinished.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/crypto/ServerFinished.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ActionCancelMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ActionProgressMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ActionResultMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarDeadStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarJumpMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BattleplanMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BeginZoningMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BindPlayerMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BroadcastWarpgateUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BugReportMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/BuildingInfoUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChainLashMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CharacterCreateRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CharacterNoRecordMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CharacterRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChatMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ContinentalLockUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DamageMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DamageWithPositionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DataChallenge.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DataChallengeMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DataChallengeMessageResp.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DensityLevelUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DeployObjectMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DeployRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DestroyMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DisconnectMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DropItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/DroppodFreefallingMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/EmoteMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ExperienceAddedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FavoritesMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FavoritesRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FireHintMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FriendsRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/FriendsResponse.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/GenericActionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/HackMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/HitHint.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/HitMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/HotSpotUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/InventoryStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/KeepAliveMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/LashMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/LoadMapMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/LoginMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/LoginRespMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/LootItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/MailMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/MountVehicleMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/MoveItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectDeployedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/OxygenStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PickupItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PingMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlayerStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PlayerStateShiftMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/PropertyOverrideMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ReleaseAvatarRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ReloadMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/RepairMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ServerVehicleOverrideMsg.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SetChatFilterMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SetEmpireMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SimDataChallenge.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SimDataChallengeResp.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SpawnRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SplashHitMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadMemberEvent.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadMembershipRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadMembershipResponse.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadState.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadWaypointEvent.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/SquadWaypointRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TimeOfDayMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/TriggerSoundMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/UnuseItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/UseItemMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VehicleStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VoiceHostInfo.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VoiceHostKill.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/VoiceHostRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WarpgateRequest.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeaponFireMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/WeatherMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ZipLineMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ZoneForcedCavernConnectionsMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ZoneInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ZoneLockInfoMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/ZonePopulationUpdateMessage.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/AegisShieldGeneratorData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/BasicCharacterData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/CaptureFlagData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/CharacterData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/ConstructorData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DestroyedVehicleData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedCharacterData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedCommandDetonaterData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedConstructionToolData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedREKData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DroppedItemData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/DroppodData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/HandheldData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/InventoryData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/LargeDeployableData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/LockerContainerData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala (99%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/OrbitalShuttleData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/PlacementData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/PlayerData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/REKData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/RemoteProjectileData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/RibbonBars.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/StreamBitSize.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/TRAPData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/TelepadDeployableData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Account.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Avatar.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Building.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Certification.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Implant.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Loadout.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Locker.scala (100%) rename {common/src => src}/main/scala/net/psforever/persistence/Login.scala (100%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/InterstellarClusterService.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/RemoverActor.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/Service.scala (96%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/ServiceManager.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/AccountIntermediaryService.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/AccountPersistenceService.scala (98%) create mode 100644 src/main/scala/net/psforever/services/account/IPAddress.scala rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/ReceiveAccountData.scala (76%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/ReceiveIPAddress.scala (69%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/RetrieveAccountData.scala (68%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/RetrieveIPAddress.scala (68%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/StoreAccountData.scala (77%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/account/StoreIPAddress.scala (72%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/avatar/AvatarService.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/avatar/AvatarServiceMessage.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/avatar/AvatarServiceResponse.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/avatar/support/CorpseRemovalActor.scala (87%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/avatar/support/DroppedItemRemover.scala (86%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/chat/ChatService.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/galaxy/GalaxyService.scala (95%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/galaxy/GalaxyServiceMessage.scala (95%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/galaxy/GalaxyServiceResponse.scala (90%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/LocalService.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/LocalServiceMessage.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/LocalServiceResponse.scala (97%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/support/DeployableRemover.scala (97%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/support/DoorCloseActor.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/support/HackCaptureActor.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/support/HackClearActor.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/local/support/RouterTelepadActivation.scala (97%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/properties/PropertyOverrideManager.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/support/SimilarityComparator.scala (87%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/support/SupportActor.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/support/SupportActorCaseConversions.scala (92%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/teamwork/SquadService.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/teamwork/SquadServiceMessage.scala (96%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/teamwork/SquadServiceResponse.scala (96%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/teamwork/SquadSwitchboard.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/vehicle/VehicleService.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/vehicle/VehicleServiceMessage.scala (99%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/vehicle/VehicleServiceResponse.scala (98%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/vehicle/support/TurretUpgrader.scala (97%) rename {common/src/main/scala => src/main/scala/net/psforever}/services/vehicle/support/VehicleRemover.scala (88%) rename {common/src => src}/main/scala/net/psforever/types/Angular.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/BailType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/CapacitorStateType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/CargoStatus.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/CharacterGender.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/CharacterVoice.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/ChatMessageType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/DriveState.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/EmoteType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/ExoSuitType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/GrenadeState.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/ImplantType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/LoadoutType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/MeritCommendation.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/PlanetSideEmpire.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/PlanetSideGUID.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/PlanetSideGeneratorState.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/SpawnGroup.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/SquadRequestType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/SquadResponseType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/SquadWaypoints.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/TransactionType.scala (100%) rename {common/src => src}/main/scala/net/psforever/types/Vector3.scala (100%) rename {common/src => src}/main/scala/net/psforever/util/Config.scala (100%) rename {common/src => src}/main/scala/net/psforever/util/Database.scala (100%) rename {common/src => src}/main/scala/net/psforever/util/DefinitionUtil.scala (100%) rename {common/src => src}/main/scala/net/psforever/util/PointOfInterest.scala (100%) rename {common/src => src}/main/scala/net/psforever/zones/Zones.scala (100%) rename {common/src => src}/main/scala/scodec/interop/akka/package.scala (100%) rename {common/src => src}/main/scala/sna/Library.scala (100%) rename {pslogin/src => src}/test/resources/logback-test.xml (100%) rename {common/src => src}/test/scala/CodecTest.scala (100%) rename {common/src => src}/test/scala/CryptoInterfaceTest.scala (100%) rename {common/src => src}/test/scala/CryptoPacketTest.scala (100%) rename {common/src => src}/test/scala/PacketCodingTest.scala (100%) rename {common/src => src}/test/scala/Vector3Test.scala (100%) rename {common/src => src}/test/scala/base/ActorTest.scala (100%) rename {common/src => src}/test/scala/base/FreedContextActorTest.scala (100%) rename {common/src => src}/test/scala/control/ClientStartTest.scala (100%) rename {common/src => src}/test/scala/control/ConnectionCloseTest.scala (100%) rename {common/src => src}/test/scala/control/ControlSyncRespTest.scala (100%) rename {common/src => src}/test/scala/control/ControlSyncTest.scala (100%) rename {common/src => src}/test/scala/control/HandleGamePacketTest.scala (100%) rename {common/src => src}/test/scala/control/MultiPacketCollectorTest.scala (100%) rename {common/src => src}/test/scala/control/MultiPacketExTest.scala (100%) rename {common/src => src}/test/scala/control/MultiPacketTest.scala (100%) rename {common/src => src}/test/scala/control/RelatedATest.scala (100%) rename {common/src => src}/test/scala/control/RelatedBTest.scala (100%) rename {common/src => src}/test/scala/control/SlottedMetaPacketTest.scala (100%) rename {common/src => src}/test/scala/control/TeardownConnectionTest.scala (100%) rename {common/src => src}/test/scala/game/ActionCancelMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ActionProgressMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ActionResultMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ArmorChangedMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarDeadStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarFirstTimeEventMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarGrenadeStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarImplantMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarJumpMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarSearchCriteriaMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarStatisticsMessageTest.scala (100%) rename {common/src => src}/test/scala/game/AvatarVehicleTimerMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BattleExperienceMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BattleplanMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BeginZoningMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BindPlayerMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BroadcastWarpgateUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BugReportMessageTest.scala (100%) rename {common/src => src}/test/scala/game/BuildingInfoUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ChainLashMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ChangeAmmoMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ChangeFireModeMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ChangeFireStateMessage_StartTest.scala (100%) rename {common/src => src}/test/scala/game/ChangeFireStateMessage_StopTest.scala (100%) rename {common/src => src}/test/scala/game/ChangeShortcutBankMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CharacterCreateRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CharacterInfoMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CharacterKnowledgeMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CharacterNoRecordMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CharacterRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ChatMsgTest.scala (100%) rename {common/src => src}/test/scala/game/ChildObjectStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ConnectToWorldMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ConnectToWorldRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ContinentalLockUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/CreateShortcutMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DamageFeedbackMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DamageMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DamageWithPositionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DataChallengeMessageRespTest.scala (100%) rename {common/src => src}/test/scala/game/DataChallengeMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DelayedPathMountMsgTest.scala (100%) rename {common/src => src}/test/scala/game/DensityLevelUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DeployObjectMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DeployRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DeployableObjectsInfoMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DestroyDisplayMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DestroyMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DisconnectMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DismountBuildingMsgTest.scala (100%) rename {common/src => src}/test/scala/game/DismountVehicleMsgTest.scala (100%) rename {common/src => src}/test/scala/game/DisplayedAwardMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DropItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/DroppodFreefallingMessageTest.scala (100%) rename {common/src => src}/test/scala/game/EmoteMsgTest.scala (100%) rename {common/src => src}/test/scala/game/ExperienceAddedMessageTest.scala (100%) rename {common/src => src}/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/FavoritesMessageTest.scala (100%) rename {common/src => src}/test/scala/game/FavoritesRequestTest.scala (100%) rename {common/src => src}/test/scala/game/FireHintMessageTest.scala (100%) rename {common/src => src}/test/scala/game/FriendsRequestTest.scala (100%) rename {common/src => src}/test/scala/game/FriendsResponseTest.scala (100%) rename {common/src => src}/test/scala/game/GenericActionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/GenericCollisionMsgTest.scala (100%) rename {common/src => src}/test/scala/game/GenericObjectActionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/GenericObjectStateMsgTest.scala (100%) rename {common/src => src}/test/scala/game/HackMessageTest.scala (100%) rename {common/src => src}/test/scala/game/HitHintTest.scala (100%) rename {common/src => src}/test/scala/game/HitMessageTest.scala (100%) rename {common/src => src}/test/scala/game/HotSpotUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/InventoryStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ItemTransactionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ItemTransactionResultMessageTest.scala (100%) rename {common/src => src}/test/scala/game/KeepAliveMessageTest.scala (100%) rename {common/src => src}/test/scala/game/LashMessageTest.scala (100%) rename {common/src => src}/test/scala/game/LoadMapMessageTest.scala (100%) rename {common/src => src}/test/scala/game/LoginMessageTest.scala (100%) rename {common/src => src}/test/scala/game/LoginRespMessageTest.scala (100%) rename {common/src => src}/test/scala/game/LootItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/MailMessageTest.scala (100%) rename {common/src => src}/test/scala/game/MountVehicleMsgTest.scala (100%) rename {common/src => src}/test/scala/game/MoveItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectAttachMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectDeleteMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectDeployedMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectDetachMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectDetectedMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ObjectHeldMessageTest.scala (100%) rename {common/src => src}/test/scala/game/OrbitalStrikeWaypointMessageTest.scala (100%) rename {common/src => src}/test/scala/game/OxygenStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PickupItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PingMsgTest.scala (100%) rename {common/src => src}/test/scala/game/PlanetsideAttributeMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PlanetsideStringAttributeMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PlayerStasisMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PlayerStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PlayerStateMessageUpstreamTest.scala (100%) rename {common/src => src}/test/scala/game/PlayerStateShiftMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ProjectileStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/PropertyOverrideMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ProximityTerminalUseMessageTest.scala (100%) rename {common/src => src}/test/scala/game/QuantityDeltaUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/QuantityUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ReleaseAvatarRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ReloadMessageTest.scala (100%) rename {common/src => src}/test/scala/game/RepairMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ReplicationStreamMessageTest.scala (100%) rename {common/src => src}/test/scala/game/RequestDestroyMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ServerVehicleOverrideMsgTest.scala (100%) rename {common/src => src}/test/scala/game/SetChatFilterMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SetEmpireMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SimDataChallengeRespTest.scala (100%) rename {common/src => src}/test/scala/game/SimDataChallengeTest.scala (100%) rename {common/src => src}/test/scala/game/SpawnRequestMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SplashHitMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SquadDefinitionActionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/SquadMemberEventTest.scala (100%) rename {common/src => src}/test/scala/game/SquadMembershipRequestTest.scala (100%) rename {common/src => src}/test/scala/game/SquadMembershipResponseTest.scala (100%) rename {common/src => src}/test/scala/game/SquadStateTest.scala (100%) rename {common/src => src}/test/scala/game/SquadWaypointEventTest.scala (100%) rename {common/src => src}/test/scala/game/TargetingImplantRequestTest.scala (100%) rename {common/src => src}/test/scala/game/TargetingInfoMessageTest.scala (100%) rename {common/src => src}/test/scala/game/TimeOfDayMessageTest.scala (100%) rename {common/src => src}/test/scala/game/TrainingZoneMessageTest.scala (100%) rename {common/src => src}/test/scala/game/TriggerEffectMessageTest.scala (100%) rename {common/src => src}/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala (100%) rename {common/src => src}/test/scala/game/TriggerSoundMessageTest.scala (100%) rename {common/src => src}/test/scala/game/UnuseItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/UseItemMessageTest.scala (100%) rename {common/src => src}/test/scala/game/VNLWorldStatusMessageTest.scala (100%) rename {common/src => src}/test/scala/game/VehicleStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/VehicleSubStateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/VoiceHostInfoTest.scala (100%) rename {common/src => src}/test/scala/game/VoiceHostKillTest.scala (100%) rename {common/src => src}/test/scala/game/VoiceHostRequestTest.scala (100%) rename {common/src => src}/test/scala/game/WarpgateRequestTest.scala (100%) rename {common/src => src}/test/scala/game/WeaponDelayFireMessageTest.scala (100%) rename {common/src => src}/test/scala/game/WeaponDryFireMessageTest.scala (100%) rename {common/src => src}/test/scala/game/WeaponFireMessageTest.scala (100%) rename {common/src => src}/test/scala/game/WeaponJammedMessageTest.scala (100%) rename {common/src => src}/test/scala/game/WeaponLazeTargetPositionMessageTest.scala (100%) rename {common/src => src}/test/scala/game/WeatherMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ZipLineMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ZoneForcedCavernConnectionsMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ZoneInfoMessageTest.scala (100%) rename {common/src => src}/test/scala/game/ZoneLockInfoMesageTest.scala (100%) rename {common/src => src}/test/scala/game/ZonePopulationUpdateMessageTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/CaptureFlagDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/CharacterDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/CommonFieldDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/HandheldDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/LockerContainerDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/REKDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/RemoteProjectileDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/RibbonBarsTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/SmallTurretDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/TRAPDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/TelepadDeployableDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreate/WeaponDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala (100%) rename {common/src => src}/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala (100%) rename {common/src => src}/test/scala/objects/AvatarTest.scala (100%) rename {common/src => src}/test/scala/objects/BuildingTest.scala (100%) rename {common/src => src}/test/scala/objects/ContainerTest.scala (100%) rename {common/src => src}/test/scala/objects/ConverterTest.scala (100%) rename {common/src => src}/test/scala/objects/DamageModelTests.scala (100%) rename {common/src => src}/test/scala/objects/DamageableTest.scala (99%) rename {common/src => src}/test/scala/objects/DefaultTest.scala (100%) rename {common/src => src}/test/scala/objects/DeployableTest.scala (99%) rename {common/src => src}/test/scala/objects/DeployableToolboxTest.scala (100%) rename {common/src => src}/test/scala/objects/DeploymentTest.scala (79%) rename {common/src => src}/test/scala/objects/DoorTest.scala (100%) rename {common/src => src}/test/scala/objects/EntityTest.scala (100%) rename {common/src => src}/test/scala/objects/EquipmentSlotTest.scala (100%) rename {common/src => src}/test/scala/objects/EquipmentTest.scala (100%) rename {common/src => src}/test/scala/objects/ExoSuitTest.scala (100%) rename {common/src => src}/test/scala/objects/FacilityTurretTest.scala (98%) rename {common/src => src}/test/scala/objects/FactionAffinityTest.scala (100%) rename {common/src => src}/test/scala/objects/FireModeTest.scala (100%) rename {common/src => src}/test/scala/objects/GeneratorTest.scala (99%) rename {common/src => src}/test/scala/objects/IFFLockTest.scala (100%) rename {common/src => src}/test/scala/objects/InventoryTest.scala (100%) rename {common/src => src}/test/scala/objects/LoadoutTest.scala (100%) rename {common/src => src}/test/scala/objects/LockerTest.scala (100%) rename {common/src => src}/test/scala/objects/MountableTest.scala (100%) rename {common/src => src}/test/scala/objects/PlayerControlTest.scala (99%) rename {common/src => src}/test/scala/objects/PlayerTest.scala (100%) rename {common/src => src}/test/scala/objects/ProjectileTest.scala (100%) rename {common/src => src}/test/scala/objects/RepairableTest.scala (99%) rename {common/src => src}/test/scala/objects/ResourceSiloTest.scala (99%) rename {common/src => src}/test/scala/objects/ServerObjectBuilderTest.scala (100%) rename {common/src => src}/test/scala/objects/SpawnTubeTest.scala (100%) rename {common/src => src}/test/scala/objects/UtilityTest.scala (100%) rename {common/src => src}/test/scala/objects/VehicleSpawnPadTest.scala (100%) rename {common/src => src}/test/scala/objects/VehicleTest.scala (99%) rename {common/src => src}/test/scala/objects/VitalityTest.scala (100%) rename {common/src => src}/test/scala/objects/ZoneTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterAmmoTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterAvatarTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterObjectTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterPlayerTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterToolTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterTurretTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskRegisterVehicleTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterAmmoTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterAvatarTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterObjectTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterPlayerTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterToolTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterTurretTest.scala (100%) rename {common/src => src}/test/scala/objects/guidtask/GUIDTaskUnregisterVehicleTest.scala (100%) rename {common/src => src}/test/scala/objects/number/NumberPoolActorTest.scala (100%) rename {common/src => src}/test/scala/objects/number/NumberPoolHubTest.scala (100%) rename {common/src => src}/test/scala/objects/number/NumberPoolTest.scala (100%) rename {common/src => src}/test/scala/objects/number/NumberSelectorTest.scala (100%) rename {common/src => src}/test/scala/objects/number/NumberSourceTest.scala (100%) rename {common/src => src}/test/scala/objects/number/RegisterTest.scala (100%) rename {common/src => src}/test/scala/objects/number/UniqueNumberSystemTest.scala (100%) rename {common/src => src}/test/scala/objects/terminal/ImplantTerminalMechTest.scala (100%) rename {common/src => src}/test/scala/objects/terminal/MatrixTerminalTest.scala (100%) rename {common/src => src}/test/scala/objects/terminal/OrderTerminalTest.scala (100%) rename {common/src => src}/test/scala/objects/terminal/ProximityTest.scala (99%) rename {common/src => src}/test/scala/objects/terminal/TerminalControlTest.scala (100%) rename {common/src => src}/test/scala/service/LocalServiceTest.scala (99%) rename {common/src => src}/test/scala/service/RemoverActorTest.scala (99%) rename {common/src => src}/test/scala/service/RouterTelepadActivationTest.scala (98%) rename {common/src => src}/test/scala/service/VehicleServiceTest.scala (99%) rename tools/decode-packets/src/main/scala/{ => net/psforever/tools/decodePackets}/DecodePackets.scala (86%) delete mode 100644 tools/decode-packets/src/main/scala/xtoolspar.scala diff --git a/.codecov.yml b/.codecov.yml index f8fb716e..0f310ab5 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -51,18 +51,11 @@ ignore: - "common/src/main/scala/net/psforever/types/MeritCommendation.scala" - "common/src/main/scala/net/psforever/types/PlanetSideEmpire.scala" - "common/src/main/scala/net/psforever/types/TransactionType.scala" - - "common/src/main/scala/services/avatar/AvatarAction.scala" - - "common/src/main/scala/services/avatar/AvatarResponse.scala" - - "common/src/main/scala/services/galaxy/GalaxyAction.scala" - - "common/src/main/scala/services/galaxy/GalaxyResponse.scala" - - "common/src/main/scala/services/local/LocalAction.scala" - - "common/src/main/scala/services/local/LocalResponse.scala" - - "common/src/main/scala/services/vehicle/VehicleAction.scala" - - "common/src/main/scala/services/vehicle/VehicleResponse.scala" - - "pslogin/src/main/scala/CryptoSessionActor.scala" - - "pslogin/src/main/scala/DatabaseConnector.scala" - - "pslogin/src/main/scala/LoginConfig.scala" - - "pslogin/src/main/scala/Maps.scala" - - "pslogin/src/main/scala/MDCContextAware.scala" - - "pslogin/src/main/scala/MDCPropagatingExecutionContext.scala" - - "pslogin/src/main/scala/Zones.scala" + - "common/src/main/scala/net.psforever.services/avatar/AvatarAction.scala" + - "common/src/main/scala/net.psforever.services/avatar/AvatarResponse.scala" + - "common/src/main/scala/net.psforever.services/galaxy/GalaxyAction.scala" + - "common/src/main/scala/net.psforever.services/galaxy/GalaxyResponse.scala" + - "common/src/main/scala/net.psforever.services/local/LocalAction.scala" + - "common/src/main/scala/net.psforever.services/local/LocalResponse.scala" + - "common/src/main/scala/net.psforever.services/vehicle/VehicleAction.scala" + - "common/src/main/scala/net.psforever.services/vehicle/VehicleResponse.scala" \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ad5dc064..46ba5565 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,9 +32,9 @@ jobs: - name: Install pscrypto run: curl -L https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip | jar vx - name: Run migrations - run: sbt "pslogin/run migrate" + run: sbt "server/run migrate" - name: Run build - run: sbt packArchiveZip + run: sbt server/packArchiveZip - name: Run tests run: sbt coverage test:compile quiet:test coverageReport - name: Upload coverage @@ -42,8 +42,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v2 with: - name: pslogin.zip - path: target/pslogin*.zip + name: server.zip + path: server/target/server*.zip docker: runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index d33f0a51..ee08dfd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mozilla/sbt:8u232_1.3.8 as builder +FROM mozilla/sbt as builder COPY . /PSF-LoginServer @@ -6,14 +6,14 @@ WORKDIR /PSF-LoginServer RUN wget https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip && \ unzip pscrypto-lib-1.1.zip && rm pscrypto-lib-1.1.zip && \ - sbt pack + sbt server/pack -FROM openjdk:8u252-slim +FROM openjdk:8-slim -COPY --from=builder /PSF-LoginServer/target/pack/ /usr/local +COPY --from=builder /PSF-LoginServer/server/target/pack/ /usr/local EXPOSE 51000 EXPOSE 51001 EXPOSE 51002 -CMD ["ps-login"] +CMD ["psf-server"] diff --git a/README.md b/README.md index bfc4eef4..515e3639 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,16 @@ # PSForever Server [![Build Status](https://travis-ci.org/psforever/PSF-LoginServer.svg?branch=master)](https://travis-ci.com/psforever/PSF-LoginServer) [![Code coverage](https://codecov.io/gh/psforever/PSF-LoginServer/coverage.svg?branch=master)](https://codecov.io/gh/psforever/PSF-LoginServer/) [![Documentation](https://img.shields.io/badge/documentation-master-lightgrey)](https://psforever.github.io/docs/master/index.html) - -Welcome to the recreated login and world servers for PlanetSide 1. We are a community of players and developers who took it upon ourselves to preserve PlanetSide 1's unique gameplay and history _forever_. + -The login and world servers (this repo runs both by default) are built to work with PlanetSide version 3.15.84.0. Anything older is not guaranteed to work. -Currently there are no binary releases of the server as the state is pre-alpha. You will need to have a development environment set up in order to get it running. -If you just want to play, you don't need to set up a development environment. Join the public test server -by following the _[PSForever Server Connection Guide](https://docs.google.com/document/d/1ZMx1NUylVZCXJNRyhkuVWT0eUKSVYu0JXsU-y3f93BY/edit)_, which has the instructions on downloading the game and using the PSForever launcher to start the game. +Welcome to the recreated login and world servers for PlanetSide 1. We are a community of players and developers who took +it upon ourselves to preserve PlanetSide 1's unique gameplay and history _forever_. + +The login and world servers (this repo runs both by default) are built to work with PlanetSide version 3.15.84.0. +Anything older is not guaranteed to work. Currently, there are no binary releases of the server as the state is +pre-alpha. You will need to have a development environment set up in order to get it running. If you just want to play, +you don't need to set up a development environment. Join the public test server by following the _[PSForever Server +Connection Guide](https://docs.google.com/document/d/1ZMx1NUylVZCXJNRyhkuVWT0eUKSVYu0JXsU-y3f93BY/edit)_, which has the +instructions on downloading the game and using the PSForever launcher to start the game.

@@ -18,57 +21,77 @@ by following the _[PSForever Server Connection Guide](https://docs.google.com/do ## Server Requirements -- SBT (Scala build tool) +- sbt (Scala build tool) - Java Development Kit (JDK) 8.0 - PSCrypto v1.1 - binary DLL (Windows) or Shared Library (Linux) placed in the root directory of the project. See [Downloading PSCrypto](#downloading-pscrypto) to get it set up. - PostgreSQL ## Setting up a Build Environment +PSF-LoginServer is writen in [Scala](https://www.scala-lang.org/) and built using sbt, which allows it to be built on +any platform. sbt is the Scala version of Make, but is more powerful as build definitions are written in Scala. sbt is +distributed as a Java JAR and the only dependency it has is a JDK. [Follow the quick instructions on Scala's home +page](https://www.scala-lang.org/download/) to get a working development environment and come back when you are done. -PSF-LoginServer is writen in [Scala](https://www.scala-lang.org/) and built using SBT, which allows it to be built on any platform. SBT is the Scala version of Make, but is more powerful as build definitions are written in Scala. SBT is distributed as a Java JAR and the only dependency it has is a JDK. [Follow the quick instructions on Scala's home page](https://www.scala-lang.org/download/) to get a working development environment and come back when you are done. +In order to compile scala, `scalac` is used behind the scenes. This is equivalent to Java's `javac`, but for the Scala +language. Scala runs on top of the Java Virtual Machine, meaning it generates `.class` and `.jar` files and uses the +`java` executable. Essentially, Scala is just a compiler that targets the JVM, which is its runtime. All of this runs in +the background and is packaged automatically by your IDE or sbt, which automatically downloads the right version of the +Scala compiler for you. -In order to compile scala, `scalac` is used behind the scenes. This is equivalent to Java's `javac`, but for the Scala language. -Scala runs on top of the Java Virtual Machine, meaning it generates `.class` and `.jar` files and -uses the `java` executable. Essentially, Scala is just a compiler that targets the JVM, which is its -runtime. All of this runs in the background and is packaged automatically by your IDE or SBT, which -automatically downloads the right version of the Scala compiler for you. - -If you have Docker and docker-compose installed on your system, you can get a complete development -environment up by running `docker-compose up` in the source code directory. Otherwise, keep reading. +If you have Docker and docker-compose installed on your system, you can get a complete development environment up by +running `docker-compose up` in the source code directory. Otherwise, keep reading. ### Using an IDE -Scala code can be fairly complex and a good IDE helps you understand the code and what methods are available for certain types, especially as you are learning the language. -IntelliJ IDEA has some of the most mature support for Scala of any IDE today. It has advanced type introspection and excellent code completion. It's recommended for those who are new to Scala in order to get familiar with the syntax. +Scala code can be fairly complex, and a good IDE helps you understand the code and what methods are available for certain +types, especially as you are learning the language. IntelliJ IDEA has some of the most mature support for Scala of any +IDE today. It has advanced type introspection and excellent code completion. It's recommended for those who are new to +Scala in order to get familiar with the syntax. [Download the community edition of IDEA](https://www.jetbrains.com/idea/download/) directly from IntelliJ's website. [Then get the required Scala plugin for IDEA](https://www.jetbrains.com/help/idea/managing-plugins.html). -Next, you need to get a copy of the LoginServer code. It's recommended that you perform a `git clone https://github.com/psforever/PSF-LoginServer.git` using your favorite git tool. You can also work from a downloaded ZIP of the source, but you cannot track/commit your changes. +Next, you need to get a copy of the LoginServer code. It's recommended that you perform a `git clone +https://github.com/psforever/PSF-LoginServer.git` using your favorite git tool. You can also work from a downloaded ZIP +of the source, but you cannot track/commit your changes. -Once you have the code downloaded, you will need to import the project into the IDE. Follow these instructions from [IntelliJ to import an SBT project](https://docs.scala-lang.org/getting-started/intellij-track/building-a-scala-project-with-intellij-and-sbt.html). -Once you have successfully imported the project ([and setup the DB](#setting-up-the-database)), navigate to the `pslogin/src/main/scala/PsLogin.scala` file, right click on the `object PsLogin` and hit 'Run PsLogin' from the context menu. This will boot up the login+world server. +Once you have the code downloaded, you will need to import the project into the IDE. Follow these instructions from +[IntelliJ to import an sbt +project](https://docs.scala-lang.org/getting-started/intellij-track/building-a-scala-project-with-intellij-and-sbt.html). +Once you have successfully imported the project ([and setup the DB](#setting-up-the-database)), create a new run +configuration with the `server/run` sbt task and click run to launch the server. -### Using SBT and a Text Editor +### Using sbt and a Text Editor -If you are not a fan of big clunky IDEs (IDEA is definitely one of them), you can opt to use your favorite text editor (VSCode, Sublime, ViM, Notepad++, Atom, etc.) and use SBT to build the project. The only dependency you will need is SBT itself. [Download SBT](http://www.scala-sbt.org/download.html) for your platform, install or extract, and open up a command line (cmd.exe, bash, CYGWIN, Git Bash) that has the Java Development Kit in its path. +If you are not a fan of big clunky IDEs (IDEA is definitely one of them), you can opt to use your favorite text editor +(VSCode, Sublime, ViM, Notepad++, Atom, etc.) and use sbt to build the project. The only dependency you will need is sbt +itself. [Download sbt](http://www.scala-sbt.org/download.html) for your platform, install or extract, and open up a +command line (cmd.exe, bash, CYGWIN, Git Bash) that has the Java Development Kit in its path. At the command line run the following commands: ``` git clone https://github.com/psforever/PSF-LoginServer.git cd PSF-LoginServer -sbt pslogin/run +sbt server/run ``` - -This will clone the repository and SBT will compile and run the login server ([make sure you have set up the DB](#setting-up-the-database)). Note: SBT is quite slow at starting up (JVM/JIT warmup). It's recommended you have an open SBT console (just run `sbt` without any arguments) in order to avoid this startup time. -With a SBT console you can run tests (and you should) using `sbt test`. +This will clone the repository and sbt will compile and run the login server ([make sure you have set up the +DB](#setting-up-the-database)). Note: sbt is quite slow at starting up (JVM/JIT warmup). It's recommended you have an +open sbt console (just run `sbt` without any arguments) in order to avoid this startup time. With a sbt console you can +run tests (and you should) using `sbt test`. ### Downloading PSCrypto +**The server requires binary builds of PSCrypto in order to run.** [Download the latest +*release](https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip) and extract the the +*approprate dll for your operating system. If you are not comfortable with compiled binaries, you can [build the +*libraries yourself](https://github.com/psforever/PSCrypto). -**The server requires binary builds of PSCrypto in order to run.** [Download the latest release](https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip) and extract the the approprate dll for your operating system. If you are not comfortable with compiled binaries, you can [build the libraries yourself](https://github.com/psforever/PSCrypto). - -SBT, IDEA, and Java will automatically find the required libraries when running the server. The build expects to find the library in a subdirectory of the root directory called /pscrypto-lib/. Historically, we have recommended placing it directly into the root directory and that has worked as well. If you still have issues with PSCrypto being detected, try adding `-Djava.library.path=` (no path necessary) to your preferred IDE's build configuration with the library in the root directory. For example, with IDEA: Run -> Edit Configuration -> (select the configuration) -> Uncheck "Use SBT shell" -> VM Parameters +sbt, IDEA, and Java will automatically find the required libraries when running the server. The build expects to find +the library in a subdirectory of the root directory called /pscrypto-lib/. Historically, we have recommended placing it +directly into the root directory and that has worked as well. If you still have issues with PSCrypto being detected, try +adding `-Djava.library.path=` (no path necessary) to your preferred IDE's build configuration with the library in the +root directory. For example, with IDEA: Run -> Edit Configuration -> (select the configuration) -> Uncheck "Use sbt +shell" -> VM Parameters ## Setting up the Database @@ -76,18 +99,20 @@ The Login and World servers require PostgreSQL for persistence. - Windows - [Official Downloads](https://www.postgresql.org/download/windows/) - Linux - [Debian](https://www.postgresql.org/download/linux/debian/) or [Ubuntu](https://www.postgresql.org/download/linux/ubuntu/) -- macOS - Application https://www.postgresql.org/download/ (or `brew install postgresql && brew services start postgresql`) +- macOS - Application https://www.postgresql.org/download/ (or `brew install postgresql && brew net.psforever.services start postgresql`) -The default database is named `psforever` and the credentials are -`psforever:psforever`. To change these, create a configuration file at -`config/psforever.conf`. For configuration options and their defaults, see -[`application.conf`](/common/src/main/resources/application.conf). The database user will need -ALL access to tables, sequences, and functions. -The permissions required can be summarized by the SQL below. -Loading this in requires access to a graphical tool such as [pgAdmin](https://www.pgadmin.org/download/) (highly recommended) or a PostgreSQL terminal (`psql`) for advanced users. +The default database is named `psforever` and the credentials are `psforever:psforever`. To change these, create a +configuration file at `config/psforever.conf`. For configuration options and their defaults, see +[`application.conf`](/src/main/resources/application.conf). The database user will need ALL access to tables, sequences, +and functions. The permissions required can be summarized by the SQL below. Loading this in requires access to a +graphical tool such as [pgAdmin](https://www.pgadmin.org/download/) (highly recommended) or a PostgreSQL terminal +(`psql`) for advanced users. -To get started using pgAdmin, run the binary. This will start the pgAdmin server and pop-up a tab in your web browser with the interface. Upon first run, enter your connection details that you created during the PostgreSQL installation. When connected, right click the "Databases" menu -> Create... -> Database: psforever -> Save. -Next, right click on the newly created database (psforever) -> Query Tool... -> Copy and paste the commands below -> Hit the "Play/Run" button. The user should be created and granted the right permissions on all future objects. +To get started using pgAdmin, run the binary. This will start the pgAdmin server and pop-up a tab in your web browser +with the interface. Upon first run, enter your connection details that you created during the PostgreSQL installation. +When connected, right click the "Databases" menu -> Create... -> Database: psforever -> Save. Next, right click on the +newly created database (psforever) -> Query Tool... -> Copy and paste the commands below -> Hit the "Play/Run" button. +The user should be created and granted the right permissions on all future objects. ```sql CREATE USER psforever; @@ -96,12 +121,12 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA PUBLIC GRANT ALL ON TABLES TO psforever; ALTER DEFAULT PRIVILEGES IN SCHEMA PUBLIC GRANT ALL ON SEQUENCES TO psforever; ALTER DEFAULT PRIVILEGES IN SCHEMA PUBLIC GRANT ALL ON FUNCTIONS TO psforever; ``` +**NOTE:** applying default privileges _after_ importing the schema will not apply them to existing objects. To fix this, +*you must drop all objects and try again or apply permissions manually using the Query Tool / `psql`. -**NOTE:** applying default privileges _after_ importing the schema will not apply them to existing objects. To fix this, you must drop all objects and try again or apply permissions manually using the Query Tool / `psql`. - -The server will automatically apply the latest schema. Migrations can also be applied manually using -the [Flyway CLI](https://flywaydb.org/documentation/commandline/). Existing databases before the -introduction of migrations must be baselined using the `flyway baseline` command. +The server will automatically apply the latest schema. Migrations can also be applied manually using the [Flyway +CLI](https://flywaydb.org/documentation/commandline/). Existing databases before the introduction of migrations must be +baselined using the `flyway baseline` command. ### Becoming a GM @@ -118,7 +143,7 @@ You can find your account id by viewing the accounts table. To run a headless, non-interactive server, run ``` -sbt pslogin/run +sbt server/run ``` PlanetSide can now connect to your server. @@ -126,7 +151,7 @@ PlanetSide can now connect to your server. To run your custom server with an interactive `scala>` REPL, run ``` -sbt pslogin/console +sbt server/console ``` ![image](https://cloud.githubusercontent.com/assets/16912082/18024110/7b48dba8-6bc8-11e6-81d8-4692bc9d48a8.png) @@ -134,34 +159,42 @@ sbt pslogin/console To start the server and begin listening for connections, enter the following expression into the REPL: ``` -PsLogin.run +Server.run ``` ![image](https://cloud.githubusercontent.com/assets/16912082/18024137/1167452a-6bc9-11e6-8765-a86fb465de61.png) -This process is identical to running the headless, non-interactive server: PlanetSide clients can connect, logging output will be printed to the screen, etc. The advantage is that you now have an interactive REPL that will evaluate any Scala expression you type into it. +This process is identical to running the headless, non-interactive server: PlanetSide clients can connect, logging +output will be printed to the screen, etc. The advantage is that you now have an interactive REPL that will evaluate any +Scala expression you type into it. ![image](https://cloud.githubusercontent.com/assets/16912082/18024339/62197f66-6bcd-11e6-90f7-5569d33472a7.png) -The REPL supports various useful commands. For example, to see the type of an arbitrary expression `foo`, run `:type foo`. To print all members of a type, run `:javap -p some-type`. You can run `:help` to see a full list of commands. +The REPL supports various useful commands. For example, to see the type of an arbitrary expression `foo`, run `:type +foo`. To print all members of a type, run `:javap -p some-type`. You can run `:help` to see a full list of commands. ![image](https://cloud.githubusercontent.com/assets/16912082/18024371/e0b72f9e-6bcd-11e6-9de5-421ec3eff994.png) ## Creating a Release -If you want to test the project without an IDE or deploy it to a server for run, you can use sbt-pack to create a release (included with the repository). -First make sure you have the [SBT tool](http://www.scala-sbt.org/download.html) on your command line (or create a new task in IntelliJ IDEA). Then get a copy of the source directory (either in ZIP or cloned form). Then do the below +If you want to test the project without an IDE or deploy it to a server for run, you can use sbt-pack to create a +release (included with the repository). First make sure you have the [sbt tool](http://www.scala-sbt.org/download.html) +on your command line (or create a new task in IntelliJ IDEA). Then get a copy of the source directory (either in ZIP or +cloned form). Then do the below ``` cd PSF-LoginServer sbt packArchiveZip # creates a single zip with resources ``` -This will use the sbt-pack plugin to create a JAR file and some helper scripts to run the server. The output for this will be in the `PSF-LoginServer\target` directory. Now you can copy the ZIP file to a server you want to run it on. You will need the Java 8 runtime (JRE only) on the target to run this. In the ZIP file, there is a `bin/` directory with some helper scripts. Run the correct file for your platform (.BAT for Windows and shell script for Unix). +This will use the sbt-pack plugin to create a JAR file and some helper scripts to run the server. The output for this +will be in the `PSF-LoginServer/target` directory. Now you can copy the ZIP file to a server you want to run it on. You +will need the Java 8 runtime (JRE only) on the target to run this. In the ZIP file, there is a `bin/` directory with +some helper scripts. Run the correct file for your platform (.BAT for Windows and shell script for Unix). ### Generating Documentation -Using SBT, you can generate documentation for both the common and pslogin projects using `sbt unidoc`. +Using sbt, you can generate documentation for both the common and pslogin projects using `sbt unidoc`. Current documentation is available at [https://psforever.github.io/docs/master/index.html](https://psforever.github.io/docs/master/index.html) @@ -205,13 +238,15 @@ If you get an error like below java.lang.UnsatisfiedLinkError: Unable to load library 'pscrypto': Native library (win32-x86-64/pscrypto.dll) not found in resource path ``` -Then you are missing the native library required to provide cryptographic functions to the login server. To fix this, you need a binary build of [PSCrypto](#downloading-pscrypto). +Then you are missing the native library required to provide cryptographic functions to the login server. To fix this, +you need a binary build of [PSCrypto](#downloading-pscrypto). If you are still having trouble on Linux, try putting the library in `root directory/pscrypto-lib/libpscrypto.so`. ## Contributing -Please fork the project and provide a pull request to contribute code. Coding guidelines and contribution checklists coming soon. +Please fork the project and provide a pull request to contribute code. Coding guidelines and contribution checklists +coming soon. ## Get in touch @@ -219,8 +254,6 @@ Please fork the project and provide a pull request to contribute code. Coding gu - Discord (chat with us): https://discord.gg/0nRe5TNbTYoUruA4 - Join the #code channel and ask any questions you have there -Chord is the lead developer and you can contact him on Discord as Chord or by email [chord@tuta.io](mailto:chord@tuta.io). Discord is preferred. - ## License GNU GPLv3. See LICENSE.md for the full copy. diff --git a/build.sbt b/build.sbt index 4d11b0a5..ee8f239e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import xerial.sbt.pack.PackPlugin._ -lazy val commonSettings = Seq( +lazy val psforeverSettings = Seq( organization := "net.psforever", version := "1.0.2-SNAPSHOT", scalaVersion := "2.13.3", @@ -82,7 +82,7 @@ lazy val commonSettings = Seq( "org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0" ), // TODO(chord): remove exclusion when SessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279 - coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*;net\\.psforever\\.zones\\.zonemaps.*" + coverageExcludedPackages := "net\\.psforever\\.actors\\.session\\.SessionActor.*" ) lazy val pscryptoSettings = Seq( @@ -91,59 +91,46 @@ lazy val pscryptoSettings = Seq( unmanagedClasspath in Compile += (baseDirectory in ThisBuild).value / "pscrypto-lib" ) -lazy val psloginPackSettings = Seq( - packMain := Map("ps-login" -> "net.psforever.pslogin.PsLogin"), - packArchivePrefix := "pslogin", - packJvmOpts := Map("ps-login" -> Seq("-Dstacktrace.app.packages=net.psforever")), - packExtraClasspath := Map("ps-login" -> Seq("${PROG_HOME}/pscrypto-lib", "${PROG_HOME}/config")), - packResourceDir += (baseDirectory.value / "pscrypto-lib" -> "pscrypto-lib"), - packResourceDir += (baseDirectory.value / "config" -> "config") -) +lazy val psforever = (project in file(".")) + .configs(QuietTest) + .settings(psforeverSettings: _*) + .settings( + name := "psforever", + // Copy all tests from Test -> QuietTest (we're only changing the run options) + inConfig(QuietTest)(Defaults.testTasks) + ) + .settings(pscryptoSettings: _*) -lazy val root = (project in file(".")) +lazy val server = (project in file("server")) .configs(QuietTest) .enablePlugins(PackPlugin) - .settings(commonSettings: _*) - .settings(psloginPackSettings: _*) - .enablePlugins(ScalaUnidocPlugin) - .aggregate(pslogin, common) - .dependsOn(pslogin, common) - -lazy val pslogin = (project in file("pslogin")) - .configs(QuietTest) - .settings(commonSettings: _*) + .settings(psforeverSettings: _*) .settings( - name := "pslogin", + name := "server", // ActorTests have specific timing requirements and will be flaky if run in parallel parallelExecution in Test := false, // Copy all tests from Test -> QuietTest (we're only changing the run options) - inConfig(QuietTest)(Defaults.testTasks) - ) - .settings(pscryptoSettings: _*) - .dependsOn(common) - -lazy val common = (project in file("common")) - .configs(QuietTest) - .settings(commonSettings: _*) - .settings( - name := "common", - // Copy all tests from Test -> QuietTest (we're only changing the run options) - inConfig(QuietTest)(Defaults.testTasks) + inConfig(QuietTest)(Defaults.testTasks), + packMain := Map("psforever-server" -> "net.psforever.server.Server"), + packArchivePrefix := "psforever-server", + packJvmOpts := Map("psforever-server" -> Seq("-Dstacktrace.app.packages=net.psforever")), + packExtraClasspath := Map("psforever-server" -> Seq("${PROG_HOME}/pscrypto-lib", "${PROG_HOME}/config")), + packResourceDir += (baseDirectory.in(psforever).value / "pscrypto-lib" -> "pscrypto-lib"), + packResourceDir += (baseDirectory.in(psforever).value / "config" -> "config") ) .settings(pscryptoSettings: _*) + .dependsOn(psforever) lazy val decodePackets = (project in file("tools/decode-packets")) .enablePlugins(PackPlugin) - .settings(commonSettings: _*) - .settings(decodePacketsPackSettings: _*) + .settings(psforeverSettings: _*) .settings( libraryDependencies ++= Seq( "org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0" - ) + ), + packMain := Map("psforever-decode-packets" -> "net.psforever.tools.decodePackets.DecodePackets") ) - .dependsOn(common) - -lazy val decodePacketsPackSettings = Seq(packMain := Map("psf-decode-packets" -> "DecodePackets")) + .dependsOn(psforever) // Special test configuration for really quiet tests (used in CI) lazy val QuietTest = config("quiet") extend Test diff --git a/common/src/main/scala/services/account/IPAddress.scala b/common/src/main/scala/services/account/IPAddress.scala deleted file mode 100644 index 3ad50cfe..00000000 --- a/common/src/main/scala/services/account/IPAddress.scala +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2017 PSForever -package services.account - -import java.net.InetSocketAddress - -class IPAddress(private val address: InetSocketAddress) { - def Address: String = address.getAddress.getHostAddress - def CanonicalHostName: String = address.getAddress.getCanonicalHostName - def HostName: String = address.getAddress.getHostName - def Port: Int = address.getPort -} diff --git a/pslogin/src/main/resources/db/migration/V001__Init.sql b/server/src/main/resources/db/migration/V001__Init.sql similarity index 100% rename from pslogin/src/main/resources/db/migration/V001__Init.sql rename to server/src/main/resources/db/migration/V001__Init.sql diff --git a/pslogin/src/main/resources/db/migration/V002__Buildings.sql b/server/src/main/resources/db/migration/V002__Buildings.sql similarity index 100% rename from pslogin/src/main/resources/db/migration/V002__Buildings.sql rename to server/src/main/resources/db/migration/V002__Buildings.sql diff --git a/pslogin/src/main/resources/db/migration/V003__Avatar.sql b/server/src/main/resources/db/migration/V003__Avatar.sql similarity index 100% rename from pslogin/src/main/resources/db/migration/V003__Avatar.sql rename to server/src/main/resources/db/migration/V003__Avatar.sql diff --git a/pslogin/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst similarity index 100% rename from pslogin/src/main/resources/overrides/game_objects0.adb.lst rename to server/src/main/resources/overrides/game_objects0.adb.lst diff --git a/pslogin/src/main/resources/overrides/game_objects29.adb.lst b/server/src/main/resources/overrides/game_objects29.adb.lst similarity index 100% rename from pslogin/src/main/resources/overrides/game_objects29.adb.lst rename to server/src/main/resources/overrides/game_objects29.adb.lst diff --git a/pslogin/src/main/resources/overrides/game_objects30.adb.lst b/server/src/main/resources/overrides/game_objects30.adb.lst similarity index 100% rename from pslogin/src/main/resources/overrides/game_objects30.adb.lst rename to server/src/main/resources/overrides/game_objects30.adb.lst diff --git a/pslogin/src/main/resources/overrides/game_objects31.adb.lst b/server/src/main/resources/overrides/game_objects31.adb.lst similarity index 100% rename from pslogin/src/main/resources/overrides/game_objects31.adb.lst rename to server/src/main/resources/overrides/game_objects31.adb.lst diff --git a/pslogin/src/main/resources/overrides/game_objects32.adb.lst b/server/src/main/resources/overrides/game_objects32.adb.lst similarity index 100% rename from pslogin/src/main/resources/overrides/game_objects32.adb.lst rename to server/src/main/resources/overrides/game_objects32.adb.lst diff --git a/pslogin/src/main/scala/PsLogin.scala b/server/src/main/scala/net/psforever/server/Server.scala similarity index 94% rename from pslogin/src/main/scala/PsLogin.scala rename to server/src/main/scala/net/psforever/server/Server.scala index 26842929..6c44a239 100644 --- a/pslogin/src/main/scala/PsLogin.scala +++ b/server/src/main/scala/net/psforever/server/Server.scala @@ -1,49 +1,39 @@ -package net.psforever.pslogin +package net.psforever.server import java.net.InetAddress +import java.nio.file.Paths import java.util.Locale -import akka.{actor => classic} import akka.actor.typed.scaladsl.adapter._ import akka.routing.RandomPool +import akka.{actor => classic} import ch.qos.logback.classic.LoggerContext import ch.qos.logback.classic.joran.JoranConfigurator -import net.psforever.crypto.CryptoInterface -import net.psforever.objects.Default -import net.psforever.objects.zones._ -import net.psforever.objects.guid.TaskResolver -import org.slf4j -import org.fusesource.jansi.Ansi._ -import org.fusesource.jansi.Ansi.Color._ -import services.{InterstellarClusterService, ServiceManager} -import services.account.{AccountIntermediaryService, AccountPersistenceService} -import services.chat.ChatService -import services.galaxy.GalaxyService -import services.teamwork.SquadService -import kamon.Kamon -import org.apache.commons.io.FileUtils -import services.properties.PropertyOverrideManager -import org.flywaydb.core.Flyway -import java.nio.file.Paths - -import scopt.OParser import io.sentry.Sentry +import kamon.Kamon import net.psforever.actors.session.SessionActor +import net.psforever.crypto.CryptoInterface import net.psforever.login.psadmin.PsAdminActor -import net.psforever.login.{ - CryptoSessionActor, - LoginSessionActor, - NetworkSimulatorParameters, - PacketCodingActor, - SessionPipeline, - SessionRouter, - TcpListener, - UdpListener -} +import net.psforever.login._ +import net.psforever.objects.Default +import net.psforever.objects.guid.TaskResolver +import net.psforever.objects.zones._ +import net.psforever.services.account.{AccountIntermediaryService, AccountPersistenceService} +import net.psforever.services.chat.ChatService +import net.psforever.services.galaxy.GalaxyService +import net.psforever.services.properties.PropertyOverrideManager +import net.psforever.services.teamwork.SquadService +import net.psforever.services.{InterstellarClusterService, ServiceManager} import net.psforever.util.Config import net.psforever.zones.Zones +import org.apache.commons.io.FileUtils +import org.flywaydb.core.Flyway +import org.fusesource.jansi.Ansi.Color._ +import org.fusesource.jansi.Ansi._ +import org.slf4j +import scopt.OParser -object PsLogin { +object Server { private val logger = org.log4s.getLogger case class CliConfig( @@ -58,7 +48,7 @@ object PsLogin { println(ansi().fgBright(BLUE).a(""" / _ \/ __/ __/__ _______ _ _____ ____""")) println(ansi().fgBright(MAGENTA).a(""" / ___/\ \/ _// _ \/ __/ -_) |/ / -_) __/""")) println(ansi().fgBright(RED).a("""/_/ /___/_/ \___/_/ \__/|___/\__/_/""").reset()) - println(""" Login Server - PSForever Project""") + println(""" PSForever Server - PSForever Project""") println(""" http://psforever.net""") println() } @@ -245,7 +235,7 @@ object PsLogin { val parser = { import builder._ OParser.sequence( - programName("ps-login"), + programName("psforever-server"), opt[Unit]("no-auto-migrate") .action((_, c) => c.copy(noAutoMigrate = true)) .text("Do not auto migrate database."), diff --git a/common/src/test/resources/logback-test.xml b/server/src/test/resources/logback-test.xml similarity index 100% rename from common/src/test/resources/logback-test.xml rename to server/src/test/resources/logback-test.xml diff --git a/pslogin/src/test/resources/testconfig.ini b/server/src/test/resources/testconfig.ini similarity index 100% rename from pslogin/src/test/resources/testconfig.ini rename to server/src/test/resources/testconfig.ini diff --git a/pslogin/src/test/scala/MDCTestProbe.scala b/server/src/test/scala/MDCTestProbe.scala similarity index 100% rename from pslogin/src/test/scala/MDCTestProbe.scala rename to server/src/test/scala/MDCTestProbe.scala diff --git a/pslogin/src/test/scala/PacketCodingActorTest.scala b/server/src/test/scala/PacketCodingActorTest.scala similarity index 100% rename from pslogin/src/test/scala/PacketCodingActorTest.scala rename to server/src/test/scala/PacketCodingActorTest.scala diff --git a/pslogin/src/test/scala/actor/base/ActorTest.scala b/server/src/test/scala/actor/base/ActorTest.scala similarity index 100% rename from pslogin/src/test/scala/actor/base/ActorTest.scala rename to server/src/test/scala/actor/base/ActorTest.scala diff --git a/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala b/server/src/test/scala/actor/objects/VehicleSpawnPadTest.scala similarity index 99% rename from pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala rename to server/src/test/scala/actor/objects/VehicleSpawnPadTest.scala index b50136a5..c2ab882a 100644 --- a/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala +++ b/server/src/test/scala/actor/objects/VehicleSpawnPadTest.scala @@ -9,8 +9,8 @@ import net.psforever.objects.serverobject.structures.StructureType import net.psforever.objects.{GlobalDefinitions, Player, Vehicle} import net.psforever.objects.zones.Zone import net.psforever.types.{PlanetSideGUID, _} -import services.RemoverActor -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.RemoverActor +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import akka.actor.typed.scaladsl.adapter._ import net.psforever.actors.zone.ZoneActor import net.psforever.objects.avatar.Avatar diff --git a/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala b/server/src/test/scala/actor/service/AvatarServiceTest.scala similarity index 99% rename from pslogin/src/test/scala/actor/service/AvatarServiceTest.scala rename to server/src/test/scala/actor/service/AvatarServiceTest.scala index f2dfa944..f912c0f0 100644 --- a/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala +++ b/server/src/test/scala/actor/service/AvatarServiceTest.scala @@ -10,8 +10,8 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.objectcreate.{DroppedItemData, ObjectClass, ObjectCreateMessageParent, PlacementData} import net.psforever.packet.game.{ObjectCreateMessage, PlayerStateMessageUpstream} import net.psforever.types._ -import services.{RemoverActor, Service, ServiceManager} -import services.avatar._ +import net.psforever.services.{RemoverActor, Service, ServiceManager} +import net.psforever.services.avatar._ import scala.concurrent.duration._ import akka.actor.typed.scaladsl.adapter._ diff --git a/common/src/main/java/scodec/interop/akka/PrivacyHelper.java b/src/main/java/scodec/interop/akka/PrivacyHelper.java similarity index 100% rename from common/src/main/java/scodec/interop/akka/PrivacyHelper.java rename to src/main/java/scodec/interop/akka/PrivacyHelper.java diff --git a/common/src/main/resources/akka.conf b/src/main/resources/akka.conf similarity index 100% rename from common/src/main/resources/akka.conf rename to src/main/resources/akka.conf diff --git a/common/src/main/resources/application.conf b/src/main/resources/application.conf similarity index 97% rename from common/src/main/resources/application.conf rename to src/main/resources/application.conf index 4b0e235a..3f923b3b 100644 --- a/common/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1,4 +1,4 @@ -# The socket bind address for all services except admin. 127.0.0.1 is the +# The socket bind address for all net.psforever.services except admin. 127.0.0.1 is the # default for local testing, for public servers use 0.0.0.0 instead. bind = 127.0.0.1 diff --git a/common/src/main/resources/dispatchers.conf b/src/main/resources/dispatchers.conf similarity index 100% rename from common/src/main/resources/dispatchers.conf rename to src/main/resources/dispatchers.conf diff --git a/common/src/main/resources/zonemaps/lattice.json b/src/main/resources/zonemaps/lattice.json similarity index 100% rename from common/src/main/resources/zonemaps/lattice.json rename to src/main/resources/zonemaps/lattice.json diff --git a/common/src/main/resources/zonemaps/map01.json b/src/main/resources/zonemaps/map01.json similarity index 100% rename from common/src/main/resources/zonemaps/map01.json rename to src/main/resources/zonemaps/map01.json diff --git a/common/src/main/resources/zonemaps/map02.json b/src/main/resources/zonemaps/map02.json similarity index 100% rename from common/src/main/resources/zonemaps/map02.json rename to src/main/resources/zonemaps/map02.json diff --git a/common/src/main/resources/zonemaps/map03.json b/src/main/resources/zonemaps/map03.json similarity index 100% rename from common/src/main/resources/zonemaps/map03.json rename to src/main/resources/zonemaps/map03.json diff --git a/common/src/main/resources/zonemaps/map04.json b/src/main/resources/zonemaps/map04.json similarity index 100% rename from common/src/main/resources/zonemaps/map04.json rename to src/main/resources/zonemaps/map04.json diff --git a/common/src/main/resources/zonemaps/map05.json b/src/main/resources/zonemaps/map05.json similarity index 100% rename from common/src/main/resources/zonemaps/map05.json rename to src/main/resources/zonemaps/map05.json diff --git a/common/src/main/resources/zonemaps/map06.json b/src/main/resources/zonemaps/map06.json similarity index 100% rename from common/src/main/resources/zonemaps/map06.json rename to src/main/resources/zonemaps/map06.json diff --git a/common/src/main/resources/zonemaps/map07.json b/src/main/resources/zonemaps/map07.json similarity index 100% rename from common/src/main/resources/zonemaps/map07.json rename to src/main/resources/zonemaps/map07.json diff --git a/common/src/main/resources/zonemaps/map08.json b/src/main/resources/zonemaps/map08.json similarity index 100% rename from common/src/main/resources/zonemaps/map08.json rename to src/main/resources/zonemaps/map08.json diff --git a/common/src/main/resources/zonemaps/map09.json b/src/main/resources/zonemaps/map09.json similarity index 100% rename from common/src/main/resources/zonemaps/map09.json rename to src/main/resources/zonemaps/map09.json diff --git a/common/src/main/resources/zonemaps/map10.json b/src/main/resources/zonemaps/map10.json similarity index 100% rename from common/src/main/resources/zonemaps/map10.json rename to src/main/resources/zonemaps/map10.json diff --git a/common/src/main/resources/zonemaps/map11.json b/src/main/resources/zonemaps/map11.json similarity index 100% rename from common/src/main/resources/zonemaps/map11.json rename to src/main/resources/zonemaps/map11.json diff --git a/common/src/main/resources/zonemaps/map12.json b/src/main/resources/zonemaps/map12.json similarity index 100% rename from common/src/main/resources/zonemaps/map12.json rename to src/main/resources/zonemaps/map12.json diff --git a/common/src/main/resources/zonemaps/map13.json b/src/main/resources/zonemaps/map13.json similarity index 100% rename from common/src/main/resources/zonemaps/map13.json rename to src/main/resources/zonemaps/map13.json diff --git a/common/src/main/resources/zonemaps/map96.json b/src/main/resources/zonemaps/map96.json similarity index 100% rename from common/src/main/resources/zonemaps/map96.json rename to src/main/resources/zonemaps/map96.json diff --git a/common/src/main/resources/zonemaps/map97.json b/src/main/resources/zonemaps/map97.json similarity index 100% rename from common/src/main/resources/zonemaps/map97.json rename to src/main/resources/zonemaps/map97.json diff --git a/common/src/main/resources/zonemaps/map98.json b/src/main/resources/zonemaps/map98.json similarity index 100% rename from common/src/main/resources/zonemaps/map98.json rename to src/main/resources/zonemaps/map98.json diff --git a/common/src/main/resources/zonemaps/map99.json b/src/main/resources/zonemaps/map99.json similarity index 100% rename from common/src/main/resources/zonemaps/map99.json rename to src/main/resources/zonemaps/map99.json diff --git a/common/src/main/resources/zonemaps/ugd01.json b/src/main/resources/zonemaps/ugd01.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd01.json rename to src/main/resources/zonemaps/ugd01.json diff --git a/common/src/main/resources/zonemaps/ugd02.json b/src/main/resources/zonemaps/ugd02.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd02.json rename to src/main/resources/zonemaps/ugd02.json diff --git a/common/src/main/resources/zonemaps/ugd03.json b/src/main/resources/zonemaps/ugd03.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd03.json rename to src/main/resources/zonemaps/ugd03.json diff --git a/common/src/main/resources/zonemaps/ugd04.json b/src/main/resources/zonemaps/ugd04.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd04.json rename to src/main/resources/zonemaps/ugd04.json diff --git a/common/src/main/resources/zonemaps/ugd05.json b/src/main/resources/zonemaps/ugd05.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd05.json rename to src/main/resources/zonemaps/ugd05.json diff --git a/common/src/main/resources/zonemaps/ugd06.json b/src/main/resources/zonemaps/ugd06.json similarity index 100% rename from common/src/main/resources/zonemaps/ugd06.json rename to src/main/resources/zonemaps/ugd06.json diff --git a/common/src/main/scala/akka/actor/MDCContextAware.scala b/src/main/scala/akka/actor/MDCContextAware.scala similarity index 100% rename from common/src/main/scala/akka/actor/MDCContextAware.scala rename to src/main/scala/akka/actor/MDCContextAware.scala diff --git a/common/src/main/scala/akka/actor/MDCPropagatingExecutionContext.scala b/src/main/scala/akka/actor/MDCPropagatingExecutionContext.scala similarity index 100% rename from common/src/main/scala/akka/actor/MDCPropagatingExecutionContext.scala rename to src/main/scala/akka/actor/MDCPropagatingExecutionContext.scala diff --git a/common/src/main/scala/net/psforever/IFinalizable.scala b/src/main/scala/net/psforever/IFinalizable.scala similarity index 100% rename from common/src/main/scala/net/psforever/IFinalizable.scala rename to src/main/scala/net/psforever/IFinalizable.scala diff --git a/common/src/main/scala/net/psforever/actors/commands/NtuCommand.scala b/src/main/scala/net/psforever/actors/commands/NtuCommand.scala similarity index 100% rename from common/src/main/scala/net/psforever/actors/commands/NtuCommand.scala rename to src/main/scala/net/psforever/actors/commands/NtuCommand.scala diff --git a/common/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala similarity index 99% rename from common/src/main/scala/net/psforever/actors/session/AvatarActor.scala rename to src/main/scala/net/psforever/actors/session/AvatarActor.scala index b5999ce2..2f389af9 100644 --- a/common/src/main/scala/net/psforever/actors/session/AvatarActor.scala +++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala @@ -60,14 +60,14 @@ import net.psforever.util.Database._ import net.psforever.persistence import net.psforever.util.DefinitionUtil import org.joda.time.{LocalDateTime, Period} -import services.ServiceManager -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.ServiceManager +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.objects.Deployables import scala.collection.mutable import scala.concurrent.{ExecutionContextExecutor, Future, Promise} import scala.util.{Failure, Success} import scala.concurrent.duration._ -import services.Service +import net.psforever.services.Service object AvatarActor { def apply(sessionActor: ActorRef[SessionActor.Command]): Behavior[Command] = diff --git a/common/src/main/scala/net/psforever/actors/session/ChatActor.scala b/src/main/scala/net/psforever/actors/session/ChatActor.scala similarity index 99% rename from common/src/main/scala/net/psforever/actors/session/ChatActor.scala rename to src/main/scala/net/psforever/actors/session/ChatActor.scala index 0492d875..5b703dcf 100644 --- a/common/src/main/scala/net/psforever/actors/session/ChatActor.scala +++ b/src/main/scala/net/psforever/actors/session/ChatActor.scala @@ -16,8 +16,8 @@ import net.psforever.packet.game.{ChatMsg, DeadState, RequestDestroyMessage, Zon import net.psforever.types.{ChatMessageType, PlanetSideEmpire, PlanetSideGUID, Vector3} import net.psforever.util.PointOfInterest import net.psforever.zones.Zones -import services.chat.ChatService -import services.chat.ChatService.ChatChannel +import net.psforever.services.chat.ChatService +import net.psforever.services.chat.ChatService.ChatChannel import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala similarity index 99% rename from common/src/main/scala/net/psforever/actors/session/SessionActor.scala rename to src/main/scala/net/psforever/actors/session/SessionActor.scala index c282c6ed..cecc0009 100644 --- a/common/src/main/scala/net/psforever/actors/session/SessionActor.scala +++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala @@ -56,22 +56,27 @@ import net.psforever.packet.game.{HotSpotInfo => PacketHotSpotInfo, _} import net.psforever.types._ import org.log4s.MDC import scodec.bits.ByteVector -import services.ServiceManager.LookupResult -import services.account.{AccountPersistenceService, PlayerToken, ReceiveAccountData, RetrieveAccountData} -import services.avatar.{AvatarAction, AvatarResponse, AvatarServiceMessage, AvatarServiceResponse} -import services.galaxy.{GalaxyAction, GalaxyResponse, GalaxyServiceMessage, GalaxyServiceResponse} -import services.local.support.RouterTelepadActivation -import services.local.{LocalAction, LocalResponse, LocalServiceMessage, LocalServiceResponse} -import services.properties.PropertyOverrideManager -import services.support.SupportActor -import services.teamwork.{SquadResponse, SquadServiceMessage, SquadServiceResponse, SquadAction => SquadServiceAction} -import services.vehicle.{VehicleAction, VehicleResponse, VehicleServiceMessage, VehicleServiceResponse} -import services.{InterstellarClusterService, RemoverActor, Service, ServiceManager} +import net.psforever.services.ServiceManager.LookupResult +import net.psforever.services.account.{AccountPersistenceService, PlayerToken, ReceiveAccountData, RetrieveAccountData} +import net.psforever.services.avatar.{AvatarAction, AvatarResponse, AvatarServiceMessage, AvatarServiceResponse} +import net.psforever.services.galaxy.{GalaxyAction, GalaxyResponse, GalaxyServiceMessage, GalaxyServiceResponse} +import net.psforever.services.local.support.RouterTelepadActivation +import net.psforever.services.local.{LocalAction, LocalResponse, LocalServiceMessage, LocalServiceResponse} +import net.psforever.services.properties.PropertyOverrideManager +import net.psforever.services.support.SupportActor +import net.psforever.services.teamwork.{ + SquadResponse, + SquadServiceMessage, + SquadServiceResponse, + SquadAction => SquadServiceAction +} +import net.psforever.services.vehicle.{VehicleAction, VehicleResponse, VehicleServiceMessage, VehicleServiceResponse} +import net.psforever.services.{InterstellarClusterService, RemoverActor, Service, ServiceManager} import net.psforever.login.{DropCryptoSession, DropSession, HelloFriend, RawPacket} import net.psforever.util.{Config, DefinitionUtil} import net.psforever.login.WorldSession._ import net.psforever.zones.Zones -import services.chat.ChatService +import net.psforever.services.chat.ChatService import net.psforever.objects.avatar.Cosmetic import scala.concurrent.ExecutionContext.Implicits.global @@ -345,7 +350,7 @@ class SessionActor extends Actor with MDCContextAware { rightRef = sender() } context.become(Started) - import services.ServiceManager.Lookup + import net.psforever.services.ServiceManager.Lookup val serviceManager = ServiceManager.serviceManager serviceManager ! Lookup("accountIntermediary") serviceManager ! Lookup("accountPersistence") diff --git a/common/src/main/scala/net/psforever/actors/zone/BuildingActor.scala b/src/main/scala/net/psforever/actors/zone/BuildingActor.scala similarity index 96% rename from common/src/main/scala/net/psforever/actors/zone/BuildingActor.scala rename to src/main/scala/net/psforever/actors/zone/BuildingActor.scala index 6df7d312..b30e730b 100644 --- a/common/src/main/scala/net/psforever/actors/zone/BuildingActor.scala +++ b/src/main/scala/net/psforever/actors/zone/BuildingActor.scala @@ -10,9 +10,9 @@ import net.psforever.objects.zones.Zone import net.psforever.persistence import net.psforever.types.PlanetSideEmpire import net.psforever.util.Database._ -import services.galaxy.{GalaxyAction, GalaxyServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} -import services.{InterstellarClusterService, ServiceManager} +import net.psforever.services.galaxy.{GalaxyAction, GalaxyServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.{InterstellarClusterService, ServiceManager} import scala.concurrent.ExecutionContext.Implicits.global import scala.util.{Failure, Success} diff --git a/common/src/main/scala/net/psforever/actors/zone/ZoneActor.scala b/src/main/scala/net/psforever/actors/zone/ZoneActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/actors/zone/ZoneActor.scala rename to src/main/scala/net/psforever/actors/zone/ZoneActor.scala diff --git a/common/src/main/scala/net/psforever/crypto/CryptoInterface.scala b/src/main/scala/net/psforever/crypto/CryptoInterface.scala similarity index 100% rename from common/src/main/scala/net/psforever/crypto/CryptoInterface.scala rename to src/main/scala/net/psforever/crypto/CryptoInterface.scala diff --git a/common/src/main/scala/net/psforever/login/CryptoSessionActor.scala b/src/main/scala/net/psforever/login/CryptoSessionActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/CryptoSessionActor.scala rename to src/main/scala/net/psforever/login/CryptoSessionActor.scala diff --git a/common/src/main/scala/net/psforever/login/LoginSessionActor.scala b/src/main/scala/net/psforever/login/LoginSessionActor.scala similarity index 98% rename from common/src/main/scala/net/psforever/login/LoginSessionActor.scala rename to src/main/scala/net/psforever/login/LoginSessionActor.scala index 52b028b6..0043b043 100644 --- a/common/src/main/scala/net/psforever/login/LoginSessionActor.scala +++ b/src/main/scala/net/psforever/login/LoginSessionActor.scala @@ -16,9 +16,9 @@ import net.psforever.util.Config import net.psforever.util.Database._ import org.log4s.MDC import scodec.bits._ -import services.ServiceManager -import services.ServiceManager.Lookup -import services.account.{ReceiveIPAddress, RetrieveIPAddress, StoreAccountData} +import net.psforever.services.ServiceManager +import net.psforever.services.ServiceManager.Lookup +import net.psforever.services.account.{ReceiveIPAddress, RetrieveIPAddress, StoreAccountData} import scala.concurrent.Future import scala.concurrent.duration._ @@ -28,6 +28,7 @@ class LoginSessionActor extends Actor with MDCContextAware { private[this] val log = org.log4s.getLogger import scala.concurrent.ExecutionContext.Implicits.global + private case class UpdateServerList() val usernameRegex = """[A-Za-z0-9]{3,}""".r diff --git a/common/src/main/scala/net/psforever/login/PacketCodingActor.scala b/src/main/scala/net/psforever/login/PacketCodingActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/PacketCodingActor.scala rename to src/main/scala/net/psforever/login/PacketCodingActor.scala diff --git a/common/src/main/scala/net/psforever/login/Session.scala b/src/main/scala/net/psforever/login/Session.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/Session.scala rename to src/main/scala/net/psforever/login/Session.scala diff --git a/common/src/main/scala/net/psforever/login/SessionRouter.scala b/src/main/scala/net/psforever/login/SessionRouter.scala similarity index 94% rename from common/src/main/scala/net/psforever/login/SessionRouter.scala rename to src/main/scala/net/psforever/login/SessionRouter.scala index ad92e31d..a7a2e547 100644 --- a/common/src/main/scala/net/psforever/login/SessionRouter.scala +++ b/src/main/scala/net/psforever/login/SessionRouter.scala @@ -9,17 +9,21 @@ import net.psforever.packet.control.ConnectionClose import net.psforever.util.Config import org.log4s.MDC import scodec.bits._ -import services.ServiceManager -import services.ServiceManager.Lookup -import services.account.{IPAddress, StoreIPAddress} +import net.psforever.services.ServiceManager +import net.psforever.services.ServiceManager.Lookup +import net.psforever.services.account.{IPAddress, StoreIPAddress} import scala.collection.mutable import scala.concurrent.duration._ sealed trait SessionRouterAPI -final case class RawPacket(data: ByteVector) extends SessionRouterAPI -final case class ResponsePacket(data: ByteVector) extends SessionRouterAPI + +final case class RawPacket(data: ByteVector) extends SessionRouterAPI + +final case class ResponsePacket(data: ByteVector) extends SessionRouterAPI + final case class DropSession(id: Long, reason: String) extends SessionRouterAPI -final case class SessionReaper() extends SessionRouterAPI + +final case class SessionReaper() extends SessionRouterAPI case class SessionPipeline(nameTemplate: String, props: Props) diff --git a/common/src/main/scala/net/psforever/login/TcpListener.scala b/src/main/scala/net/psforever/login/TcpListener.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/TcpListener.scala rename to src/main/scala/net/psforever/login/TcpListener.scala diff --git a/common/src/main/scala/net/psforever/login/UdpListener.scala b/src/main/scala/net/psforever/login/UdpListener.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/UdpListener.scala rename to src/main/scala/net/psforever/login/UdpListener.scala diff --git a/common/src/main/scala/net/psforever/login/UdpNetworkSimulator.scala b/src/main/scala/net/psforever/login/UdpNetworkSimulator.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/UdpNetworkSimulator.scala rename to src/main/scala/net/psforever/login/UdpNetworkSimulator.scala diff --git a/common/src/main/scala/net/psforever/login/WorldSession.scala b/src/main/scala/net/psforever/login/WorldSession.scala similarity index 99% rename from common/src/main/scala/net/psforever/login/WorldSession.scala rename to src/main/scala/net/psforever/login/WorldSession.scala index 577e33d3..7ba59e80 100644 --- a/common/src/main/scala/net/psforever/login/WorldSession.scala +++ b/src/main/scala/net/psforever/login/WorldSession.scala @@ -12,8 +12,8 @@ import net.psforever.objects.zones.Zone import net.psforever.objects.{AmmoBox, GlobalDefinitions, Player, Tool} import net.psforever.packet.game.ObjectHeldMessage import net.psforever.types.{PlanetSideGUID, TransactionType, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future @@ -26,6 +26,7 @@ object WorldSession { /** * Convert a boolean value into an integer value. * Use: `true:Int` or `false:Int` + * * @param b `true` or `false` (or `null`) * @return 1 for `true`; 0 for `false` */ diff --git a/common/src/main/scala/net/psforever/login/psadmin/CmdInternal.scala b/src/main/scala/net/psforever/login/psadmin/CmdInternal.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/psadmin/CmdInternal.scala rename to src/main/scala/net/psforever/login/psadmin/CmdInternal.scala diff --git a/common/src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala b/src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala similarity index 94% rename from common/src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala rename to src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala index c933a31a..d7098680 100644 --- a/common/src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala +++ b/src/main/scala/net/psforever/login/psadmin/CmdListPlayers.scala @@ -2,7 +2,7 @@ package net.psforever.login.psadmin import akka.actor.typed.receptionist.Receptionist import akka.actor.{Actor, ActorRef} -import services.{InterstellarClusterService, ServiceManager} +import net.psforever.services.{InterstellarClusterService, ServiceManager} import scala.collection.mutable.Map import akka.actor.typed.scaladsl.adapter._ diff --git a/common/src/main/scala/net/psforever/login/psadmin/CmdShutdown.scala b/src/main/scala/net/psforever/login/psadmin/CmdShutdown.scala similarity index 100% rename from common/src/main/scala/net/psforever/login/psadmin/CmdShutdown.scala rename to src/main/scala/net/psforever/login/psadmin/CmdShutdown.scala diff --git a/common/src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala b/src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala similarity index 98% rename from common/src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala rename to src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala index 91da77db..ed85bec4 100644 --- a/common/src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala +++ b/src/main/scala/net/psforever/login/psadmin/PsAdminActor.scala @@ -9,8 +9,8 @@ import org.json4s._ import org.json4s.native.Serialization.write import scodec.bits._ import scodec.interop.akka._ -import services.ServiceManager.Lookup -import services._ +import net.psforever.services.ServiceManager.Lookup +import net.psforever.services._ import scala.collection.mutable.Map diff --git a/common/src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala b/src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala similarity index 91% rename from common/src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala rename to src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala index e5febd8a..00367f8f 100644 --- a/common/src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala +++ b/src/main/scala/net/psforever/login/psadmin/PsAdminCommands.scala @@ -23,10 +23,10 @@ object PsAdminCommands { def usage: String } - /// A command with full access to the ActorSystem and WorldServer services. + /// A command with full access to the ActorSystem and WorldServer net.psforever.services. /// Spawns an Actor to handle the request and the service queries case class Command[T](usage: String, handler: Class[T]) extends CommandInfo - /// A command without access to the ActorSystem or any services + /// A command without access to the ActorSystem or any net.psforever.services case class CommandInternal(usage: String, handler: ((Array[String]) => CommandResponse)) extends CommandInfo } diff --git a/common/src/main/scala/net/psforever/newcodecs/BinaryChoiceCodec.scala b/src/main/scala/net/psforever/newcodecs/BinaryChoiceCodec.scala similarity index 100% rename from common/src/main/scala/net/psforever/newcodecs/BinaryChoiceCodec.scala rename to src/main/scala/net/psforever/newcodecs/BinaryChoiceCodec.scala diff --git a/common/src/main/scala/net/psforever/newcodecs/PrefixedVectorCodec.scala b/src/main/scala/net/psforever/newcodecs/PrefixedVectorCodec.scala similarity index 100% rename from common/src/main/scala/net/psforever/newcodecs/PrefixedVectorCodec.scala rename to src/main/scala/net/psforever/newcodecs/PrefixedVectorCodec.scala diff --git a/common/src/main/scala/net/psforever/newcodecs/QuantizedDoubleCodec.scala b/src/main/scala/net/psforever/newcodecs/QuantizedDoubleCodec.scala similarity index 100% rename from common/src/main/scala/net/psforever/newcodecs/QuantizedDoubleCodec.scala rename to src/main/scala/net/psforever/newcodecs/QuantizedDoubleCodec.scala diff --git a/common/src/main/scala/net/psforever/newcodecs/package.scala b/src/main/scala/net/psforever/newcodecs/package.scala similarity index 100% rename from common/src/main/scala/net/psforever/newcodecs/package.scala rename to src/main/scala/net/psforever/newcodecs/package.scala diff --git a/common/src/main/scala/net/psforever/objects/Account.scala b/src/main/scala/net/psforever/objects/Account.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Account.scala rename to src/main/scala/net/psforever/objects/Account.scala diff --git a/common/src/main/scala/net/psforever/objects/AmmoBox.scala b/src/main/scala/net/psforever/objects/AmmoBox.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/AmmoBox.scala rename to src/main/scala/net/psforever/objects/AmmoBox.scala diff --git a/common/src/main/scala/net/psforever/objects/BoomerDeployable.scala b/src/main/scala/net/psforever/objects/BoomerDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/BoomerDeployable.scala rename to src/main/scala/net/psforever/objects/BoomerDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/BoomerTrigger.scala b/src/main/scala/net/psforever/objects/BoomerTrigger.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/BoomerTrigger.scala rename to src/main/scala/net/psforever/objects/BoomerTrigger.scala diff --git a/common/src/main/scala/net/psforever/objects/ConstructionItem.scala b/src/main/scala/net/psforever/objects/ConstructionItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ConstructionItem.scala rename to src/main/scala/net/psforever/objects/ConstructionItem.scala diff --git a/common/src/main/scala/net/psforever/objects/Default.scala b/src/main/scala/net/psforever/objects/Default.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Default.scala rename to src/main/scala/net/psforever/objects/Default.scala diff --git a/common/src/main/scala/net/psforever/objects/Deployables.scala b/src/main/scala/net/psforever/objects/Deployables.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/Deployables.scala rename to src/main/scala/net/psforever/objects/Deployables.scala index 702c854e..6cb27350 100644 --- a/common/src/main/scala/net/psforever/objects/Deployables.scala +++ b/src/main/scala/net/psforever/objects/Deployables.scala @@ -9,8 +9,8 @@ import net.psforever.objects.ce.{Deployable, DeployedItem} import net.psforever.objects.zones.Zone import net.psforever.packet.game.{DeployableInfo, DeploymentAction} import net.psforever.types.PlanetSideGUID -import services.RemoverActor -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.RemoverActor +import net.psforever.services.local.{LocalAction, LocalServiceMessage} object Deployables { private val log = org.log4s.getLogger("Deployables") diff --git a/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala b/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala rename to src/main/scala/net/psforever/objects/ExplosiveDeployable.scala index 0811ad3f..66c261ab 100644 --- a/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala +++ b/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala @@ -12,9 +12,9 @@ import net.psforever.objects.serverobject.damage.Damageable import net.psforever.objects.vital.{StandardResolutions, Vitality} import net.psforever.objects.zones.Zone import net.psforever.types.{PlanetSideGUID, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala rename to src/main/scala/net/psforever/objects/GlobalDefinitions.scala diff --git a/common/src/main/scala/net/psforever/objects/Kit.scala b/src/main/scala/net/psforever/objects/Kit.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Kit.scala rename to src/main/scala/net/psforever/objects/Kit.scala diff --git a/common/src/main/scala/net/psforever/objects/LivePlayerList.scala b/src/main/scala/net/psforever/objects/LivePlayerList.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/LivePlayerList.scala rename to src/main/scala/net/psforever/objects/LivePlayerList.scala diff --git a/common/src/main/scala/net/psforever/objects/LocalProjectile.scala b/src/main/scala/net/psforever/objects/LocalProjectile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/LocalProjectile.scala rename to src/main/scala/net/psforever/objects/LocalProjectile.scala diff --git a/common/src/main/scala/net/psforever/objects/LockerContainer.scala b/src/main/scala/net/psforever/objects/LockerContainer.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/LockerContainer.scala rename to src/main/scala/net/psforever/objects/LockerContainer.scala index 529cf97e..c3652596 100644 --- a/common/src/main/scala/net/psforever/objects/LockerContainer.scala +++ b/src/main/scala/net/psforever/objects/LockerContainer.scala @@ -10,8 +10,8 @@ import net.psforever.objects.serverobject.containable.{Containable, ContainableB import net.psforever.packet.game.{ObjectAttachMessage, ObjectCreateDetailedMessage, ObjectDetachMessage} import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * The companion of a `Locker` that is carried with a player diff --git a/common/src/main/scala/net/psforever/objects/Ntu.scala b/src/main/scala/net/psforever/objects/Ntu.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Ntu.scala rename to src/main/scala/net/psforever/objects/Ntu.scala diff --git a/common/src/main/scala/net/psforever/objects/ObjectType.scala b/src/main/scala/net/psforever/objects/ObjectType.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ObjectType.scala rename to src/main/scala/net/psforever/objects/ObjectType.scala diff --git a/common/src/main/scala/net/psforever/objects/OffhandEquipmentSlot.scala b/src/main/scala/net/psforever/objects/OffhandEquipmentSlot.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/OffhandEquipmentSlot.scala rename to src/main/scala/net/psforever/objects/OffhandEquipmentSlot.scala diff --git a/common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala b/src/main/scala/net/psforever/objects/OwnableByPlayer.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala rename to src/main/scala/net/psforever/objects/OwnableByPlayer.scala diff --git a/common/src/main/scala/net/psforever/objects/PlanetSideGameObject.scala b/src/main/scala/net/psforever/objects/PlanetSideGameObject.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/PlanetSideGameObject.scala rename to src/main/scala/net/psforever/objects/PlanetSideGameObject.scala diff --git a/common/src/main/scala/net/psforever/objects/Player.scala b/src/main/scala/net/psforever/objects/Player.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Player.scala rename to src/main/scala/net/psforever/objects/Player.scala diff --git a/common/src/main/scala/net/psforever/objects/Players.scala b/src/main/scala/net/psforever/objects/Players.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/Players.scala rename to src/main/scala/net/psforever/objects/Players.scala index a9139c87..08ef599d 100644 --- a/common/src/main/scala/net/psforever/objects/Players.scala +++ b/src/main/scala/net/psforever/objects/Players.scala @@ -7,8 +7,8 @@ import net.psforever.objects.inventory.InventoryItem import net.psforever.objects.loadouts.InfantryLoadout import net.psforever.packet.game.{InventoryStateMessage, RepairMessage} import net.psforever.types.{ExoSuitType, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.annotation.tailrec @@ -18,7 +18,8 @@ object Players { /** * Evaluate the progress of the user applying a tool to modify some other server object. * This action is using the medical applicator to revive a fallen (dead but not released) ally. - * @param target the player being affected by the revive action + * + * @param target the player being affected by the revive action * @param user the player performing the revive action * @param item the tool being used to revive the target player * @param progress the current progress value diff --git a/common/src/main/scala/net/psforever/objects/SensorDeployable.scala b/src/main/scala/net/psforever/objects/SensorDeployable.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/SensorDeployable.scala rename to src/main/scala/net/psforever/objects/SensorDeployable.scala index ee799d9b..c7314dc6 100644 --- a/common/src/main/scala/net/psforever/objects/SensorDeployable.scala +++ b/src/main/scala/net/psforever/objects/SensorDeployable.scala @@ -13,9 +13,9 @@ import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.repair.RepairableEntity import net.psforever.objects.vital.StandardResolutions import net.psforever.types.{PlanetSideGUID, Vector3} -import services.Service -import services.local.{LocalAction, LocalServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/Session.scala b/src/main/scala/net/psforever/objects/Session.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Session.scala rename to src/main/scala/net/psforever/objects/Session.scala diff --git a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala b/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala rename to src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala index 01f1beb0..feb1f129 100644 --- a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala +++ b/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala @@ -14,8 +14,8 @@ import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.repair.RepairableEntity import net.psforever.objects.vital.resolution.ResolutionCalculations import net.psforever.types.PlanetSideGUID -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} class ShieldGeneratorDeployable(cdef: ShieldGeneratorDefinition) extends ComplexDeployable(cdef) diff --git a/common/src/main/scala/net/psforever/objects/SimpleItem.scala b/src/main/scala/net/psforever/objects/SimpleItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/SimpleItem.scala rename to src/main/scala/net/psforever/objects/SimpleItem.scala diff --git a/common/src/main/scala/net/psforever/objects/SpawnPoint.scala b/src/main/scala/net/psforever/objects/SpawnPoint.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/SpawnPoint.scala rename to src/main/scala/net/psforever/objects/SpawnPoint.scala diff --git a/common/src/main/scala/net/psforever/objects/Telepad.scala b/src/main/scala/net/psforever/objects/Telepad.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Telepad.scala rename to src/main/scala/net/psforever/objects/Telepad.scala diff --git a/common/src/main/scala/net/psforever/objects/TelepadDeployable.scala b/src/main/scala/net/psforever/objects/TelepadDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/TelepadDeployable.scala rename to src/main/scala/net/psforever/objects/TelepadDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/Tool.scala b/src/main/scala/net/psforever/objects/Tool.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Tool.scala rename to src/main/scala/net/psforever/objects/Tool.scala diff --git a/common/src/main/scala/net/psforever/objects/TrapDeployable.scala b/src/main/scala/net/psforever/objects/TrapDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/TrapDeployable.scala rename to src/main/scala/net/psforever/objects/TrapDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/TurretDeployable.scala b/src/main/scala/net/psforever/objects/TurretDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/TurretDeployable.scala rename to src/main/scala/net/psforever/objects/TurretDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/Vehicle.scala b/src/main/scala/net/psforever/objects/Vehicle.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/Vehicle.scala rename to src/main/scala/net/psforever/objects/Vehicle.scala diff --git a/common/src/main/scala/net/psforever/objects/Vehicles.scala b/src/main/scala/net/psforever/objects/Vehicles.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/Vehicles.scala rename to src/main/scala/net/psforever/objects/Vehicles.scala index a043db96..2d49af63 100644 --- a/common/src/main/scala/net/psforever/objects/Vehicles.scala +++ b/src/main/scala/net/psforever/objects/Vehicles.scala @@ -9,10 +9,10 @@ import net.psforever.objects.vehicles.{CargoBehavior, Utility, UtilityType, Vehi import net.psforever.objects.zones.Zone import net.psforever.packet.game.TriggeredSound import net.psforever.types.{DriveState, PlanetSideGUID, Vector3} -import services.{RemoverActor, Service} -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.{RemoverActor, Service} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ @@ -21,8 +21,9 @@ object Vehicles { /** * na + * * @param vehicle na - * @param player na + * @param player na * @return na */ def Own(vehicle: Vehicle, player: Player): Option[Vehicle] = Own(vehicle, Some(player)) diff --git a/common/src/main/scala/net/psforever/objects/avatar/Avatar.scala b/src/main/scala/net/psforever/objects/avatar/Avatar.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/Avatar.scala rename to src/main/scala/net/psforever/objects/avatar/Avatar.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/Avatars.scala b/src/main/scala/net/psforever/objects/avatar/Avatars.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/Avatars.scala rename to src/main/scala/net/psforever/objects/avatar/Avatars.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/BattleRank.scala b/src/main/scala/net/psforever/objects/avatar/BattleRank.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/BattleRank.scala rename to src/main/scala/net/psforever/objects/avatar/BattleRank.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/Certification.scala b/src/main/scala/net/psforever/objects/avatar/Certification.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/Certification.scala rename to src/main/scala/net/psforever/objects/avatar/Certification.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/CommandRank.scala b/src/main/scala/net/psforever/objects/avatar/CommandRank.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/CommandRank.scala rename to src/main/scala/net/psforever/objects/avatar/CommandRank.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/CorpseControl.scala b/src/main/scala/net/psforever/objects/avatar/CorpseControl.scala similarity index 95% rename from common/src/main/scala/net/psforever/objects/avatar/CorpseControl.scala rename to src/main/scala/net/psforever/objects/avatar/CorpseControl.scala index ec6d897e..6e1cafaf 100644 --- a/common/src/main/scala/net/psforever/objects/avatar/CorpseControl.scala +++ b/src/main/scala/net/psforever/objects/avatar/CorpseControl.scala @@ -8,8 +8,8 @@ import net.psforever.objects.serverobject.containable.{Containable, ContainableB import net.psforever.packet.game.{ObjectAttachMessage, ObjectCreateDetailedMessage, ObjectDetachMessage} import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent import net.psforever.types.{PlanetSideEmpire, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} class CorpseControl(player: Player) extends Actor with ContainableBehavior { def ContainerObject = player diff --git a/common/src/main/scala/net/psforever/objects/avatar/Cosmetic.scala b/src/main/scala/net/psforever/objects/avatar/Cosmetic.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/Cosmetic.scala rename to src/main/scala/net/psforever/objects/avatar/Cosmetic.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala b/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala rename to src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/FirstTimeEvents.scala b/src/main/scala/net/psforever/objects/avatar/FirstTimeEvents.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/FirstTimeEvents.scala rename to src/main/scala/net/psforever/objects/avatar/FirstTimeEvents.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/Implant.scala b/src/main/scala/net/psforever/objects/avatar/Implant.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/Implant.scala rename to src/main/scala/net/psforever/objects/avatar/Implant.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/LoadoutManager.scala b/src/main/scala/net/psforever/objects/avatar/LoadoutManager.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/avatar/LoadoutManager.scala rename to src/main/scala/net/psforever/objects/avatar/LoadoutManager.scala diff --git a/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala rename to src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index 7a9880ce..d0cfda29 100644 --- a/common/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala @@ -20,9 +20,9 @@ import net.psforever.objects.zones.Zone import net.psforever.packet.game._ import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent import net.psforever.types._ -import services.{RemoverActor, Service} -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.{RemoverActor, Service} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import akka.actor.typed import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/ballistics/ComplexDeployableSource.scala b/src/main/scala/net/psforever/objects/ballistics/ComplexDeployableSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/ComplexDeployableSource.scala rename to src/main/scala/net/psforever/objects/ballistics/ComplexDeployableSource.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala b/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala rename to src/main/scala/net/psforever/objects/ballistics/DeployableSource.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala b/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala rename to src/main/scala/net/psforever/objects/ballistics/ObjectSource.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala b/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala rename to src/main/scala/net/psforever/objects/ballistics/PlayerSource.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/Projectile.scala b/src/main/scala/net/psforever/objects/ballistics/Projectile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/Projectile.scala rename to src/main/scala/net/psforever/objects/ballistics/Projectile.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala b/src/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala rename to src/main/scala/net/psforever/objects/ballistics/ProjectileResolution.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/Projectiles.scala b/src/main/scala/net/psforever/objects/ballistics/Projectiles.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/Projectiles.scala rename to src/main/scala/net/psforever/objects/ballistics/Projectiles.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/ResolvedProjectile.scala b/src/main/scala/net/psforever/objects/ballistics/ResolvedProjectile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/ResolvedProjectile.scala rename to src/main/scala/net/psforever/objects/ballistics/ResolvedProjectile.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala b/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala rename to src/main/scala/net/psforever/objects/ballistics/SourceEntry.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala b/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala rename to src/main/scala/net/psforever/objects/ballistics/VehicleSource.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/ComplexDeployable.scala b/src/main/scala/net/psforever/objects/ce/ComplexDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/ComplexDeployable.scala rename to src/main/scala/net/psforever/objects/ce/ComplexDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/Deployable.scala b/src/main/scala/net/psforever/objects/ce/Deployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/Deployable.scala rename to src/main/scala/net/psforever/objects/ce/Deployable.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/DeployableCategory.scala b/src/main/scala/net/psforever/objects/ce/DeployableCategory.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/DeployableCategory.scala rename to src/main/scala/net/psforever/objects/ce/DeployableCategory.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/DeployedItem.scala b/src/main/scala/net/psforever/objects/ce/DeployedItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/DeployedItem.scala rename to src/main/scala/net/psforever/objects/ce/DeployedItem.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/SimpleDeployable.scala b/src/main/scala/net/psforever/objects/ce/SimpleDeployable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/SimpleDeployable.scala rename to src/main/scala/net/psforever/objects/ce/SimpleDeployable.scala diff --git a/common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala b/src/main/scala/net/psforever/objects/ce/TelepadLike.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala rename to src/main/scala/net/psforever/objects/ce/TelepadLike.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/AmmoBoxDefinition.scala b/src/main/scala/net/psforever/objects/definition/AmmoBoxDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/AmmoBoxDefinition.scala rename to src/main/scala/net/psforever/objects/definition/AmmoBoxDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/AvatarDefinition.scala b/src/main/scala/net/psforever/objects/definition/AvatarDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/AvatarDefinition.scala rename to src/main/scala/net/psforever/objects/definition/AvatarDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/BasicDefinition.scala b/src/main/scala/net/psforever/objects/definition/BasicDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/BasicDefinition.scala rename to src/main/scala/net/psforever/objects/definition/BasicDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/CargoDefinition.scala b/src/main/scala/net/psforever/objects/definition/CargoDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/CargoDefinition.scala rename to src/main/scala/net/psforever/objects/definition/CargoDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ConstructionItemDefinition.scala b/src/main/scala/net/psforever/objects/definition/ConstructionItemDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ConstructionItemDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ConstructionItemDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/EquipmentDefinition.scala b/src/main/scala/net/psforever/objects/definition/EquipmentDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/EquipmentDefinition.scala rename to src/main/scala/net/psforever/objects/definition/EquipmentDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala b/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ImplantDefinition.scala b/src/main/scala/net/psforever/objects/definition/ImplantDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ImplantDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ImplantDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/KitDefinition.scala b/src/main/scala/net/psforever/objects/definition/KitDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/KitDefinition.scala rename to src/main/scala/net/psforever/objects/definition/KitDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ObjectDefinition.scala b/src/main/scala/net/psforever/objects/definition/ObjectDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ObjectDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ObjectDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ProjectileDefinition.scala b/src/main/scala/net/psforever/objects/definition/ProjectileDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ProjectileDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ProjectileDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/SeatDefinition.scala b/src/main/scala/net/psforever/objects/definition/SeatDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/SeatDefinition.scala rename to src/main/scala/net/psforever/objects/definition/SeatDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/SimpleDeployableDefinition.scala b/src/main/scala/net/psforever/objects/definition/SimpleDeployableDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/SimpleDeployableDefinition.scala rename to src/main/scala/net/psforever/objects/definition/SimpleDeployableDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/SimpleItemDefinition.scala b/src/main/scala/net/psforever/objects/definition/SimpleItemDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/SimpleItemDefinition.scala rename to src/main/scala/net/psforever/objects/definition/SimpleItemDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/ToolDefinition.scala b/src/main/scala/net/psforever/objects/definition/ToolDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/ToolDefinition.scala rename to src/main/scala/net/psforever/objects/definition/ToolDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala b/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala rename to src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/DestroyedVehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/DestroyedVehicleConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/DestroyedVehicleConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/DestroyedVehicleConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/DroppodConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/DroppodConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/DroppodConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/DroppodConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/KitConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/KitConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/KitConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/KitConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/PacketConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/PacketConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/PacketConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/PacketConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SeatConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/SeatConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/SeatConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/SeatConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SpawnTubeConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/SpawnTubeConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/SpawnTubeConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/SpawnTubeConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/StatConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/StatConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/StatConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/StatConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TerminalConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/TerminalConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/TerminalConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/TerminalConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala rename to src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala diff --git a/common/src/main/scala/net/psforever/objects/entity/GUIDException.scala b/src/main/scala/net/psforever/objects/entity/GUIDException.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/entity/GUIDException.scala rename to src/main/scala/net/psforever/objects/entity/GUIDException.scala diff --git a/common/src/main/scala/net/psforever/objects/entity/Identifiable.scala b/src/main/scala/net/psforever/objects/entity/Identifiable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/entity/Identifiable.scala rename to src/main/scala/net/psforever/objects/entity/Identifiable.scala diff --git a/common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala b/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala rename to src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala diff --git a/common/src/main/scala/net/psforever/objects/entity/SimpleWorldEntity.scala b/src/main/scala/net/psforever/objects/entity/SimpleWorldEntity.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/entity/SimpleWorldEntity.scala rename to src/main/scala/net/psforever/objects/entity/SimpleWorldEntity.scala diff --git a/common/src/main/scala/net/psforever/objects/entity/WorldEntity.scala b/src/main/scala/net/psforever/objects/entity/WorldEntity.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/entity/WorldEntity.scala rename to src/main/scala/net/psforever/objects/entity/WorldEntity.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/Ammo.scala b/src/main/scala/net/psforever/objects/equipment/Ammo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/Ammo.scala rename to src/main/scala/net/psforever/objects/equipment/Ammo.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/CItem.scala b/src/main/scala/net/psforever/objects/equipment/CItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/CItem.scala rename to src/main/scala/net/psforever/objects/equipment/CItem.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala rename to src/main/scala/net/psforever/objects/equipment/EffectTarget.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/Equipment.scala b/src/main/scala/net/psforever/objects/equipment/Equipment.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/Equipment.scala rename to src/main/scala/net/psforever/objects/equipment/Equipment.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/EquipmentSize.scala b/src/main/scala/net/psforever/objects/equipment/EquipmentSize.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/EquipmentSize.scala rename to src/main/scala/net/psforever/objects/equipment/EquipmentSize.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/EquipmentSlot.scala b/src/main/scala/net/psforever/objects/equipment/EquipmentSlot.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/EquipmentSlot.scala rename to src/main/scala/net/psforever/objects/equipment/EquipmentSlot.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/FireModeDefinition.scala b/src/main/scala/net/psforever/objects/equipment/FireModeDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/FireModeDefinition.scala rename to src/main/scala/net/psforever/objects/equipment/FireModeDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/FireModeSwitch.scala b/src/main/scala/net/psforever/objects/equipment/FireModeSwitch.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/FireModeSwitch.scala rename to src/main/scala/net/psforever/objects/equipment/FireModeSwitch.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala b/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala rename to src/main/scala/net/psforever/objects/equipment/JammingUnit.scala index 40525595..19171270 100644 --- a/common/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala +++ b/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala @@ -8,8 +8,8 @@ import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.vehicles.MountedWeapons import net.psforever.objects.zones.ZoneAware import net.psforever.types.Vector3 -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.collection.mutable import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/equipment/Kits.scala b/src/main/scala/net/psforever/objects/equipment/Kits.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/Kits.scala rename to src/main/scala/net/psforever/objects/equipment/Kits.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala b/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala rename to src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala diff --git a/common/src/main/scala/net/psforever/objects/equipment/SItem.scala b/src/main/scala/net/psforever/objects/equipment/SItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/equipment/SItem.scala rename to src/main/scala/net/psforever/objects/equipment/SItem.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/AvailabilityPolicy.scala b/src/main/scala/net/psforever/objects/guid/AvailabilityPolicy.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/AvailabilityPolicy.scala rename to src/main/scala/net/psforever/objects/guid/AvailabilityPolicy.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/GUIDTask.scala b/src/main/scala/net/psforever/objects/guid/GUIDTask.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/GUIDTask.scala rename to src/main/scala/net/psforever/objects/guid/GUIDTask.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala b/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala rename to src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/Task.scala b/src/main/scala/net/psforever/objects/guid/Task.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/Task.scala rename to src/main/scala/net/psforever/objects/guid/Task.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/TaskResolver.scala b/src/main/scala/net/psforever/objects/guid/TaskResolver.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/TaskResolver.scala rename to src/main/scala/net/psforever/objects/guid/TaskResolver.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/actor/NumberPoolActor.scala b/src/main/scala/net/psforever/objects/guid/actor/NumberPoolActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/actor/NumberPoolActor.scala rename to src/main/scala/net/psforever/objects/guid/actor/NumberPoolActor.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/actor/Register.scala b/src/main/scala/net/psforever/objects/guid/actor/Register.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/actor/Register.scala rename to src/main/scala/net/psforever/objects/guid/actor/Register.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/actor/UniqueNumberSystem.scala b/src/main/scala/net/psforever/objects/guid/actor/UniqueNumberSystem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/actor/UniqueNumberSystem.scala rename to src/main/scala/net/psforever/objects/guid/actor/UniqueNumberSystem.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/actor/Unregister.scala b/src/main/scala/net/psforever/objects/guid/actor/Unregister.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/actor/Unregister.scala rename to src/main/scala/net/psforever/objects/guid/actor/Unregister.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala b/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala rename to src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/key/Monitor.scala b/src/main/scala/net/psforever/objects/guid/key/Monitor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/key/Monitor.scala rename to src/main/scala/net/psforever/objects/guid/key/Monitor.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/key/SecureKey.scala b/src/main/scala/net/psforever/objects/guid/key/SecureKey.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/key/SecureKey.scala rename to src/main/scala/net/psforever/objects/guid/key/SecureKey.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/pool/ExclusivePool.scala b/src/main/scala/net/psforever/objects/guid/pool/ExclusivePool.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/pool/ExclusivePool.scala rename to src/main/scala/net/psforever/objects/guid/pool/ExclusivePool.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/pool/GenericPool.scala b/src/main/scala/net/psforever/objects/guid/pool/GenericPool.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/pool/GenericPool.scala rename to src/main/scala/net/psforever/objects/guid/pool/GenericPool.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/pool/NumberPool.scala b/src/main/scala/net/psforever/objects/guid/pool/NumberPool.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/pool/NumberPool.scala rename to src/main/scala/net/psforever/objects/guid/pool/NumberPool.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/pool/SimplePool.scala b/src/main/scala/net/psforever/objects/guid/pool/SimplePool.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/pool/SimplePool.scala rename to src/main/scala/net/psforever/objects/guid/pool/SimplePool.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/NumberSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/NumberSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/NumberSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/NumberSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/OpportunisticSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/OpportunisticSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/OpportunisticSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/OpportunisticSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/RandomSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/RandomSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/RandomSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/RandomSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/RandomSequenceSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/RandomSequenceSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/RandomSequenceSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/RandomSequenceSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/SpecificSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/SpecificSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/SpecificSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/SpecificSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/selector/StrictInOrderSelector.scala b/src/main/scala/net/psforever/objects/guid/selector/StrictInOrderSelector.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/selector/StrictInOrderSelector.scala rename to src/main/scala/net/psforever/objects/guid/selector/StrictInOrderSelector.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/source/Key.scala b/src/main/scala/net/psforever/objects/guid/source/Key.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/source/Key.scala rename to src/main/scala/net/psforever/objects/guid/source/Key.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/source/LimitedNumberSource.scala b/src/main/scala/net/psforever/objects/guid/source/LimitedNumberSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/source/LimitedNumberSource.scala rename to src/main/scala/net/psforever/objects/guid/source/LimitedNumberSource.scala diff --git a/common/src/main/scala/net/psforever/objects/guid/source/NumberSource.scala b/src/main/scala/net/psforever/objects/guid/source/NumberSource.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/guid/source/NumberSource.scala rename to src/main/scala/net/psforever/objects/guid/source/NumberSource.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/Container.scala b/src/main/scala/net/psforever/objects/inventory/Container.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/Container.scala rename to src/main/scala/net/psforever/objects/inventory/Container.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala b/src/main/scala/net/psforever/objects/inventory/GridInventory.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala rename to src/main/scala/net/psforever/objects/inventory/GridInventory.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/InventoryDisarrayException.scala b/src/main/scala/net/psforever/objects/inventory/InventoryDisarrayException.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/InventoryDisarrayException.scala rename to src/main/scala/net/psforever/objects/inventory/InventoryDisarrayException.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/InventoryEquipmentSlot.scala b/src/main/scala/net/psforever/objects/inventory/InventoryEquipmentSlot.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/InventoryEquipmentSlot.scala rename to src/main/scala/net/psforever/objects/inventory/InventoryEquipmentSlot.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala b/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala rename to src/main/scala/net/psforever/objects/inventory/InventoryItem.scala diff --git a/common/src/main/scala/net/psforever/objects/inventory/InventoryTile.scala b/src/main/scala/net/psforever/objects/inventory/InventoryTile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/inventory/InventoryTile.scala rename to src/main/scala/net/psforever/objects/inventory/InventoryTile.scala diff --git a/common/src/main/scala/net/psforever/objects/loadouts/EquipmentLoadout.scala b/src/main/scala/net/psforever/objects/loadouts/EquipmentLoadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/loadouts/EquipmentLoadout.scala rename to src/main/scala/net/psforever/objects/loadouts/EquipmentLoadout.scala diff --git a/common/src/main/scala/net/psforever/objects/loadouts/InfantryLoadout.scala b/src/main/scala/net/psforever/objects/loadouts/InfantryLoadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/loadouts/InfantryLoadout.scala rename to src/main/scala/net/psforever/objects/loadouts/InfantryLoadout.scala diff --git a/common/src/main/scala/net/psforever/objects/loadouts/Loadout.scala b/src/main/scala/net/psforever/objects/loadouts/Loadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/loadouts/Loadout.scala rename to src/main/scala/net/psforever/objects/loadouts/Loadout.scala diff --git a/common/src/main/scala/net/psforever/objects/loadouts/SquadLoadout.scala b/src/main/scala/net/psforever/objects/loadouts/SquadLoadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/loadouts/SquadLoadout.scala rename to src/main/scala/net/psforever/objects/loadouts/SquadLoadout.scala diff --git a/common/src/main/scala/net/psforever/objects/loadouts/VehicleLoadout.scala b/src/main/scala/net/psforever/objects/loadouts/VehicleLoadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/loadouts/VehicleLoadout.scala rename to src/main/scala/net/psforever/objects/loadouts/VehicleLoadout.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala b/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala rename to src/main/scala/net/psforever/objects/serverobject/CommonMessages.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/PlanetSideServerObject.scala b/src/main/scala/net/psforever/objects/serverobject/PlanetSideServerObject.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/PlanetSideServerObject.scala rename to src/main/scala/net/psforever/objects/serverobject/PlanetSideServerObject.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/ServerObjectBuilder.scala b/src/main/scala/net/psforever/objects/serverobject/ServerObjectBuilder.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/ServerObjectBuilder.scala rename to src/main/scala/net/psforever/objects/serverobject/ServerObjectBuilder.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinity.scala b/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinity.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinity.scala rename to src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinity.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinityBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinityBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinityBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/affinity/FactionAffinityBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/Damageable.scala b/src/main/scala/net/psforever/objects/serverobject/damage/Damageable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/Damageable.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/Damageable.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala index 78244226..3a9eac90 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableAmenity.scala @@ -3,7 +3,7 @@ package net.psforever.objects.serverobject.damage import net.psforever.objects.ballistics.ResolvedProjectile import net.psforever.objects.serverobject.structures.Amenity -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * The "control" `Actor` mixin for damage-handling code diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala index 2144dde1..e4591747 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableEntity.scala @@ -8,8 +8,8 @@ import net.psforever.objects.vital.Vitality import net.psforever.objects.vital.resolution.ResolutionCalculations import net.psforever.objects.zones.Zone import net.psforever.types.PlanetSideGUID -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * The "control" `Actor` mixin for damage-handling code, diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala index ca47405a..cc3e5a8b 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala @@ -5,8 +5,8 @@ import net.psforever.objects.Player import net.psforever.objects.ballistics.{PlayerSource, ResolvedProjectile} import net.psforever.objects.serverobject.mount.Mountable import net.psforever.packet.game.DamageWithPositionMessage -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * Functions to assist other damage-dealing code for objects that contain users. @@ -15,6 +15,7 @@ object DamageableMountable { /** * A damaged target alerts its occupants (as it is a `Mountable` object) of the source of the damage. + * * @see `AvatarAction.HitHint` * @see `AvatarAction.SendResponse` * @see `AvatarServiceMessage` diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala index d84de3ca..c3d26a3d 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableVehicle.scala @@ -6,8 +6,8 @@ import net.psforever.objects.{Vehicle, Vehicles} import net.psforever.objects.ballistics.ResolvedProjectile import net.psforever.objects.serverobject.damage.Damageable.Target import net.psforever.objects.vital.resolution.ResolutionCalculations -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala similarity index 92% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala index 2a71f0dc..b7fab97a 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala +++ b/src/main/scala/net/psforever/objects/serverobject/damage/DamageableWeaponTurret.scala @@ -4,10 +4,10 @@ package net.psforever.objects.serverobject.damage import net.psforever.objects.ballistics.ResolvedProjectile import net.psforever.objects.serverobject.turret.{TurretUpgrade, WeaponTurret} import net.psforever.objects.vehicles.MountedWeapons -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.vehicle.support.TurretUpgrader -import services.vehicle.VehicleServiceMessage +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.vehicle.support.TurretUpgrader +import net.psforever.services.vehicle.VehicleServiceMessage /** * The "control" `Actor` mixin for damage-handling code for `WeaponTurret` objects. diff --git a/common/src/main/scala/net/psforever/objects/serverobject/deploy/Deployment.scala b/src/main/scala/net/psforever/objects/serverobject/deploy/Deployment.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/deploy/Deployment.scala rename to src/main/scala/net/psforever/objects/serverobject/deploy/Deployment.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala index 0c189d91..e495f32b 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala +++ b/src/main/scala/net/psforever/objects/serverobject/deploy/DeploymentBehavior.scala @@ -3,8 +3,8 @@ package net.psforever.objects.serverobject.deploy import akka.actor.Actor import net.psforever.types.{DriveState, Vector3} -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -15,6 +15,7 @@ import scala.concurrent.duration._ * `TryDeploy`, * and `TryUndeploy`. * This is a mix-in trait for combining with existing `Receive` logic. + * * @see `Deployment` * @see `DriveState` */ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/doors/Door.scala b/src/main/scala/net/psforever/objects/serverobject/doors/Door.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/doors/Door.scala rename to src/main/scala/net/psforever/objects/serverobject/doors/Door.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/doors/DoorControl.scala b/src/main/scala/net/psforever/objects/serverobject/doors/DoorControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/doors/DoorControl.scala rename to src/main/scala/net/psforever/objects/serverobject/doors/DoorControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/doors/DoorDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/doors/DoorDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/doors/DoorDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/doors/DoorDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/generator/Generator.scala b/src/main/scala/net/psforever/objects/serverobject/generator/Generator.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/generator/Generator.scala rename to src/main/scala/net/psforever/objects/serverobject/generator/Generator.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala rename to src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala index e749696d..799b339f 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala @@ -12,14 +12,15 @@ import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.vital.DamageFromExplosion import net.psforever.packet.game.TriggerEffectMessage import net.psforever.types.{PlanetSideGeneratorState, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ import scala.concurrent.ExecutionContext.Implicits.global /** * An `Actor` that handles messages being dispatched to a specific `Generator`. + * * @param gen the `Generator` object being governed */ class GeneratorControl(gen: Generator) diff --git a/common/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/generator/GeneratorDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala b/src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala similarity index 95% rename from common/src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala rename to src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala index a37aada7..0614472c 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala +++ b/src/main/scala/net/psforever/objects/serverobject/hackable/GenericHackables.scala @@ -5,9 +5,9 @@ import net.psforever.objects.{Player, Vehicle} import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} import net.psforever.packet.game.{HackMessage, HackState} import net.psforever.types.PlanetSideGUID -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import scala.util.{Failure, Success} @@ -16,8 +16,9 @@ object GenericHackables { /** * na + * * @param player the player doing the hacking - * @param obj the object being hacked + * @param obj the object being hacked * @return the percentage amount of progress per tick */ def GetHackSpeed(player: Player, obj: PlanetSideServerObject): Float = { diff --git a/common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala b/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala rename to src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/hackable/HackableBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/hackable/HackableBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/hackable/HackableBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/hackable/HackableBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/hackable/HackableDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/hackable/HackableDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/hackable/HackableDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/hackable/HackableDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMech.scala b/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMech.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMech.scala rename to src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMech.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechControl.scala b/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechControl.scala rename to src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/implantmech/ImplantTerminalMechDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLock.scala b/src/main/scala/net/psforever/objects/serverobject/locks/IFFLock.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLock.scala rename to src/main/scala/net/psforever/objects/serverobject/locks/IFFLock.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockControl.scala b/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockControl.scala rename to src/main/scala/net/psforever/objects/serverobject/locks/IFFLockControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLockDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/locks/IFFLockDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala b/src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala similarity index 81% rename from common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala rename to src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala index 6a9e69ab..4e10f1fb 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala +++ b/src/main/scala/net/psforever/objects/serverobject/locks/IFFLocks.scala @@ -1,14 +1,15 @@ // Copyright (c) 2020 PSForever package net.psforever.objects.serverobject.locks -import services.Service -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.Service +import net.psforever.services.local.{LocalAction, LocalServiceMessage} object IFFLocks { /** * The process of resecuring an IFF lock is finished * Clear the hack state and send to clients + * * @param lock the `IFFLock` object that has been resecured */ def FinishResecuringIFFLock(lock: IFFLock)(): Unit = { diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala b/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala rename to src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerControl.scala b/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerControl.scala rename to src/main/scala/net/psforever/objects/serverobject/mblocker/LockerControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/mblocker/LockerDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/mblocker/LockerDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mount/Mountable.scala b/src/main/scala/net/psforever/objects/serverobject/mount/Mountable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/mount/Mountable.scala rename to src/main/scala/net/psforever/objects/serverobject/mount/Mountable.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mount/MountableBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/mount/MountableBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/mount/MountableBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/mount/MountableBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala b/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala index a6a31410..92d9f8cc 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnControl.scala @@ -6,8 +6,8 @@ import net.psforever.objects.serverobject.affinity.{FactionAffinity, FactionAffi import net.psforever.objects.serverobject.pad.process.{VehicleSpawnControlBase, VehicleSpawnControlConcealPlayer} import net.psforever.objects.zones.Zone import net.psforever.objects.{Default, Player, Vehicle} -import services.RemoverActor -import services.vehicle.VehicleServiceMessage +import net.psforever.services.RemoverActor +import net.psforever.services.vehicle.VehicleServiceMessage import scala.annotation.tailrec import scala.concurrent.ExecutionContext.Implicits.global @@ -28,6 +28,7 @@ import scala.concurrent.duration._ * If the process is completed, or is ever aborted by any of the subsequent tasks, * control will propagate down back to this control object. * At this time, (or) once again, a new order can be submitted or will be selected. + * * @param pad the `VehicleSpawnPad` object being governed */ class VehicleSpawnControl(pad: VehicleSpawnPad) diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala b/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPadDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPadDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPadDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPadDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlBase.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlBase.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlBase.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlBase.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlConcealPlayer.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlConcealPlayer.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlConcealPlayer.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlConcealPlayer.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlDriverControl.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlDriverControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlDriverControl.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlDriverControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala index 548aff62..0010cf22 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala +++ b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala @@ -3,7 +3,7 @@ package net.psforever.objects.serverobject.pad.process import net.psforever.objects.serverobject.pad.{VehicleSpawnControl, VehicleSpawnPad} import net.psforever.types.{PlanetSideGUID, Vector3} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlLoadVehicle.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlLoadVehicle.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlLoadVehicle.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlLoadVehicle.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlRailJack.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlSeatDriver.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlSeatDriver.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlSeatDriver.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlSeatDriver.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlServerVehicleOverride.scala b/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlServerVehicleOverride.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlServerVehicleOverride.scala rename to src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlServerVehicleOverride.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/painbox/Painbox.scala b/src/main/scala/net/psforever/objects/serverobject/painbox/Painbox.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/painbox/Painbox.scala rename to src/main/scala/net/psforever/objects/serverobject/painbox/Painbox.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala b/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala rename to src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala index 68223539..b3cd5816 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala @@ -5,7 +5,7 @@ import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.{Default, GlobalDefinitions} import net.psforever.types.{PlanetSideEmpire, Vector3} -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/painbox/PainboxDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/repair/Repairable.scala b/src/main/scala/net/psforever/objects/serverobject/repair/Repairable.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/repair/Repairable.scala rename to src/main/scala/net/psforever/objects/serverobject/repair/Repairable.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala similarity index 94% rename from common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala rename to src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala index f5449daa..4ef89b45 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableAmenity.scala @@ -2,7 +2,7 @@ package net.psforever.objects.serverobject.repair import net.psforever.objects.serverobject.structures.Amenity -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * The "control" `Actor` mixin for repair-handling code diff --git a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala rename to src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala index b707277d..50df18dd 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableEntity.scala @@ -4,12 +4,13 @@ package net.psforever.objects.serverobject.repair import net.psforever.objects.{Player, Tool} import net.psforever.packet.game.{InventoryStateMessage, RepairMessage} import net.psforever.types.{PlanetSideEmpire, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * The "control" `Actor` mixin for repair-handling code, * for both expansion into other mixins and specific application on its own. + * * @see `Player` * @see `Tool` */ @@ -19,6 +20,7 @@ trait RepairableEntity extends Repairable { * Catch the expected repair message and * apply further checks to the combination of the target, the equipment, and tis user. * If the checks pass, perform the repair. + * * @param player the user of the nano dispenser tool * @param item the nano dispenser tool */ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableVehicle.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableVehicle.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableVehicle.scala rename to src/main/scala/net/psforever/objects/serverobject/repair/RepairableVehicle.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala similarity index 93% rename from common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala rename to src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala index 4bd01f35..af207ed8 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala +++ b/src/main/scala/net/psforever/objects/serverobject/repair/RepairableWeaponTurret.scala @@ -4,8 +4,8 @@ package net.psforever.objects.serverobject.repair import net.psforever.objects.Tool import net.psforever.objects.serverobject.turret.WeaponTurret import net.psforever.objects.vehicles.MountedWeapons -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} /** * The "control" `Actor` mixin for repair-handling code for `WeaponTurret` objects. diff --git a/common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSilo.scala b/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSilo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSilo.scala rename to src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSilo.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala b/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala rename to src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala index 2edde6ea..83eedd9a 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloControl.scala @@ -9,9 +9,9 @@ import net.psforever.objects.serverobject.transfer.TransferBehavior import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.{Ntu, NtuContainer, NtuStorageBehavior} import net.psforever.types.PlanetSideEmpire -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/resourcesilo/ResourceSiloDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/Amenity.scala b/src/main/scala/net/psforever/objects/serverobject/structures/Amenity.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/Amenity.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/Amenity.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/AmenityDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/structures/AmenityDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/AmenityDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/AmenityDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/AmenityOwner.scala b/src/main/scala/net/psforever/objects/serverobject/structures/AmenityOwner.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/AmenityOwner.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/AmenityOwner.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala b/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/Building.scala index 035b2b99..4cd7de33 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala +++ b/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala @@ -17,8 +17,8 @@ import net.psforever.objects.zones.Zone import net.psforever.packet.game.BuildingInfoUpdateMessage import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, PlanetSideGeneratorState, Vector3} import scalax.collection.{Graph, GraphEdge} -import services.Service -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.Service +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import akka.actor.typed.scaladsl.adapter._ class Building( diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/BuildingDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/structures/BuildingDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/BuildingDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/BuildingDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/FoundationBuilder.scala b/src/main/scala/net/psforever/objects/serverobject/structures/FoundationBuilder.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/FoundationBuilder.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/FoundationBuilder.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/SphereOfInfluence.scala b/src/main/scala/net/psforever/objects/serverobject/structures/SphereOfInfluence.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/SphereOfInfluence.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/SphereOfInfluence.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/StructureType.scala b/src/main/scala/net/psforever/objects/serverobject/structures/StructureType.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/StructureType.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/StructureType.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/WarpGate.scala b/src/main/scala/net/psforever/objects/serverobject/structures/WarpGate.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/structures/WarpGate.scala rename to src/main/scala/net/psforever/objects/serverobject/structures/WarpGate.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminal.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminal.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminal.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminal.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalControl.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalControl.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala index 25d9b508..84acaea9 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/CaptureTerminals.scala @@ -3,7 +3,7 @@ package net.psforever.objects.serverobject.terminals import net.psforever.objects.Player import net.psforever.objects.serverobject.CommonMessages -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import scala.util.{Failure, Success} diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/EquipmentTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/EquipmentTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/EquipmentTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/EquipmentTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/GeneratorTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/GeneratorTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/GeneratorTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/GeneratorTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ImplantTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ImplantTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ImplantTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ImplantTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/MatrixTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/MatrixTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/MatrixTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/MatrixTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/MedicalTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/MedicalTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/MedicalTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/MedicalTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/OrderTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/OrderTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/OrderTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/OrderTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ProximityDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala index 9527e47e..ad8acfb8 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminal.scala @@ -5,14 +5,15 @@ import net.psforever.objects.{Default, Player} import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} import net.psforever.objects.serverobject.structures.Amenity import net.psforever.types.Vector3 -import services.Service +import net.psforever.services.Service /** - * A server object that is a "terminal" that can be accessed for amenities and services, + * A server object that is a "terminal" that can be accessed for amenities and net.psforever.services, * triggered when a certain distance from the unit itself (proximity-based).
*
* Unlike conventional terminals, this structure is not necessarily structure-owned. * For example, the cavern crystals are considered owner-neutral elements that are not attached to a `Building` object. + * * @param tdef the `ObjectDefinition` that constructs this object and maintains some of its immutable fields */ class ProximityTerminal(tdef: ProximityTerminalDefinition) extends Terminal(tdef) with ProximityUnit { diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala similarity index 92% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala index da9a9e8c..27e3cf1f 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityTerminalDefinition.scala @@ -4,8 +4,9 @@ package net.psforever.objects.serverobject.terminals import net.psforever.objects.Player /** - * The definition for any `Terminal` that can be accessed for amenities and services, + * The definition for any `Terminal` that can be accessed for amenities and net.psforever.services, * triggered when a certain distance from the unit itself (proximity-based). + * * @param objectId the object's identifier number */ class ProximityTerminalDefinition(objectId: Int) extends TerminalDefinition(objectId) with ProximityDefinition { diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityUnit.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityUnit.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/ProximityUnit.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/ProximityUnit.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala index a00eb5d2..3517d3b1 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala +++ b/src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala @@ -10,12 +10,13 @@ import net.psforever.packet.game.{ItemTransactionMessage, TriggeredSound} import net.psforever.types.{PlanetSideGUID, Vector3} /** - * A server object that can be accessed for services and other amenities. + * A server object that can be accessed for net.psforever.services and other amenities. * Terminals are owned by both `Structure` objects and by `Vehicle` objects * and generally conform to the faction affiliation of the owner. * Some `Structure`-owned terminals may be compromised * to extend functionality to other's not of faction affiliation for a short time * while `Vehicle`-owned terminals may not. + * * @param tdef the `ObjectDefinition` that constructs this object and maintains some of its immutable fields */ class Terminal(tdef: TerminalDefinition) extends Amenity with Hackable { diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalControl.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalControl.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/TerminalControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/TerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/TerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/terminals/VehicleTerminalDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/VehicleTerminalDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/terminals/VehicleTerminalDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/terminals/VehicleTerminalDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/transfer/TransferBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/transfer/TransferBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/transfer/TransferBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/transfer/TransferBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/transfer/TransferContainer.scala b/src/main/scala/net/psforever/objects/serverobject/transfer/TransferContainer.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/transfer/TransferContainer.scala rename to src/main/scala/net/psforever/objects/serverobject/transfer/TransferContainer.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTube.scala b/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTube.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTube.scala rename to src/main/scala/net/psforever/objects/serverobject/tube/SpawnTube.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeControl.scala b/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeControl.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeControl.scala rename to src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeControl.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/tube/SpawnTubeDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala index 79ac8e92..44a85f83 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala @@ -12,8 +12,8 @@ import net.psforever.objects.serverobject.damage.DamageableWeaponTurret import net.psforever.objects.serverobject.hackable.GenericHackables import net.psforever.objects.serverobject.repair.Repairable.Target import net.psforever.objects.serverobject.repair.RepairableWeaponTurret -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -24,6 +24,7 @@ import scala.concurrent.duration._ * Mounted turrets have only slightly different entry requirements than a normal vehicle * because they encompass both faction-specific facility turrets * and faction-blind cavern sentry turrets. + * * @param turret the `MannedTurret` object being governed */ class FacilityTurretControl(turret: FacilityTurret) diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/TurretDefinition.scala b/src/main/scala/net/psforever/objects/serverobject/turret/TurretDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/TurretDefinition.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/TurretDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/TurretUpgrade.scala b/src/main/scala/net/psforever/objects/serverobject/turret/TurretUpgrade.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/TurretUpgrade.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/TurretUpgrade.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala b/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala b/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala similarity index 84% rename from common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala rename to src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala index c4c3a8d5..a1f6017f 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala +++ b/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurrets.scala @@ -3,10 +3,10 @@ package net.psforever.objects.serverobject.turret import net.psforever.objects.{Player, Tool} import net.psforever.packet.game.InventoryStateMessage -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.vehicle.VehicleServiceMessage -import services.vehicle.support.TurretUpgrader +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.vehicle.VehicleServiceMessage +import net.psforever.services.vehicle.support.TurretUpgrader object WeaponTurrets { private val log = org.log4s.getLogger("WeaponTurrets") @@ -15,8 +15,9 @@ object WeaponTurrets { * The process of upgrading a turret's weapon(s) is completed. * Pass the message onto the turret and onto the vehicle events system. * Additionally, force-deplete the ammunition count of the nano-dispenser used to perform the upgrade. - * @param target the turret - * @param tool the nano-dispenser that was used to perform this upgrade + * + * @param target the turret + * @param tool the nano-dispenser that was used to perform this upgrade * @param upgrade the new upgrade state */ def FinishUpgradingMannedTurret( diff --git a/common/src/main/scala/net/psforever/objects/serverobject/zipline/ZipLinePath.scala b/src/main/scala/net/psforever/objects/serverobject/zipline/ZipLinePath.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/zipline/ZipLinePath.scala rename to src/main/scala/net/psforever/objects/serverobject/zipline/ZipLinePath.scala diff --git a/common/src/main/scala/net/psforever/objects/teamwork/Member.scala b/src/main/scala/net/psforever/objects/teamwork/Member.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/teamwork/Member.scala rename to src/main/scala/net/psforever/objects/teamwork/Member.scala diff --git a/common/src/main/scala/net/psforever/objects/teamwork/Squad.scala b/src/main/scala/net/psforever/objects/teamwork/Squad.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/teamwork/Squad.scala rename to src/main/scala/net/psforever/objects/teamwork/Squad.scala diff --git a/common/src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala b/src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala similarity index 97% rename from common/src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala rename to src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala index bd1a32ef..f4bee28b 100644 --- a/common/src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala +++ b/src/main/scala/net/psforever/objects/teamwork/SquadFeatures.scala @@ -3,8 +3,8 @@ package net.psforever.objects.teamwork import akka.actor.{ActorContext, ActorRef, Props} import net.psforever.types.SquadWaypoints -import services.teamwork.SquadService.WaypointData -import services.teamwork.SquadSwitchboard +import net.psforever.services.teamwork.SquadService.WaypointData +import net.psforever.services.teamwork.SquadSwitchboard class SquadFeatures(val Squad: Squad) { diff --git a/common/src/main/scala/net/psforever/objects/vehicles/AccessPermissionGroup.scala b/src/main/scala/net/psforever/objects/vehicles/AccessPermissionGroup.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/AccessPermissionGroup.scala rename to src/main/scala/net/psforever/objects/vehicles/AccessPermissionGroup.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala b/src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala rename to src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala index c880c6e2..683093db 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala +++ b/src/main/scala/net/psforever/objects/vehicles/AntTransferBehavior.scala @@ -10,8 +10,8 @@ import net.psforever.objects.serverobject.structures.WarpGate import net.psforever.objects.serverobject.transfer.{TransferBehavior, TransferContainer} import net.psforever.objects.{NtuContainer, _} import net.psforever.types.DriveState -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import akka.actor.typed.scaladsl.adapter._ import scala.concurrent.ExecutionContext.Implicits.global diff --git a/common/src/main/scala/net/psforever/objects/vehicles/Cargo.scala b/src/main/scala/net/psforever/objects/vehicles/Cargo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/Cargo.scala rename to src/main/scala/net/psforever/objects/vehicles/Cargo.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala b/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala rename to src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala index 4c4d67d8..1262b3c3 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala +++ b/src/main/scala/net/psforever/objects/vehicles/CargoBehavior.scala @@ -12,9 +12,9 @@ import net.psforever.packet.game.{ PlanetsideAttributeMessage } import net.psforever.types.{CargoStatus, PlanetSideGUID, Vector3} -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.Service -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/vehicles/CargoVehicleRestriction.scala b/src/main/scala/net/psforever/objects/vehicles/CargoVehicleRestriction.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/CargoVehicleRestriction.scala rename to src/main/scala/net/psforever/objects/vehicles/CargoVehicleRestriction.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/DestroyedVehicle.scala b/src/main/scala/net/psforever/objects/vehicles/DestroyedVehicle.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/DestroyedVehicle.scala rename to src/main/scala/net/psforever/objects/vehicles/DestroyedVehicle.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/MountedWeapons.scala b/src/main/scala/net/psforever/objects/vehicles/MountedWeapons.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/MountedWeapons.scala rename to src/main/scala/net/psforever/objects/vehicles/MountedWeapons.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/Seat.scala b/src/main/scala/net/psforever/objects/vehicles/Seat.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/Seat.scala rename to src/main/scala/net/psforever/objects/vehicles/Seat.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/SeatArmorRestriction.scala b/src/main/scala/net/psforever/objects/vehicles/SeatArmorRestriction.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/SeatArmorRestriction.scala rename to src/main/scala/net/psforever/objects/vehicles/SeatArmorRestriction.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/Turrets.scala b/src/main/scala/net/psforever/objects/vehicles/Turrets.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/Turrets.scala rename to src/main/scala/net/psforever/objects/vehicles/Turrets.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/Utility.scala b/src/main/scala/net/psforever/objects/vehicles/Utility.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/Utility.scala rename to src/main/scala/net/psforever/objects/vehicles/Utility.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala b/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala similarity index 98% rename from common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala rename to src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala index 56b181e8..1e8a4038 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala +++ b/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala @@ -20,14 +20,14 @@ import net.psforever.objects.serverobject.repair.RepairableVehicle import net.psforever.objects.serverobject.terminals.Terminal import net.psforever.objects.vital.VehicleShieldCharge import net.psforever.objects.zones.Zone -import services.RemoverActor +import net.psforever.services.RemoverActor import net.psforever.packet.game._ import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent import net.psforever.types.{DriveState, ExoSuitType, PlanetSideGUID, Vector3} -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ @@ -37,6 +37,7 @@ import scala.concurrent.duration._ *
* Vehicle-controlling actors have two behavioral states - responsive and "`Disabled`." * The latter is applicable only when the specific vehicle is being deconstructed. + * * @param vehicle the `Vehicle` object being governed */ class VehicleControl(vehicle: Vehicle) diff --git a/common/src/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala b/src/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala rename to src/main/scala/net/psforever/objects/vehicles/VehicleLockState.scala diff --git a/common/src/main/scala/net/psforever/objects/vehicles/VehicleManifest.scala b/src/main/scala/net/psforever/objects/vehicles/VehicleManifest.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vehicles/VehicleManifest.scala rename to src/main/scala/net/psforever/objects/vehicles/VehicleManifest.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala b/src/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala rename to src/main/scala/net/psforever/objects/vital/DamageResistanceModel.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/DamageType.scala b/src/main/scala/net/psforever/objects/vital/DamageType.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/DamageType.scala rename to src/main/scala/net/psforever/objects/vital/DamageType.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/StandardDamageProfile.scala b/src/main/scala/net/psforever/objects/vital/StandardDamageProfile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/StandardDamageProfile.scala rename to src/main/scala/net/psforever/objects/vital/StandardDamageProfile.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala b/src/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala rename to src/main/scala/net/psforever/objects/vital/StandardResistanceProfile.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/StandardResistances.scala b/src/main/scala/net/psforever/objects/vital/StandardResistances.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/StandardResistances.scala rename to src/main/scala/net/psforever/objects/vital/StandardResistances.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/StandardResolutions.scala b/src/main/scala/net/psforever/objects/vital/StandardResolutions.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/StandardResolutions.scala rename to src/main/scala/net/psforever/objects/vital/StandardResolutions.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/Vitality.scala b/src/main/scala/net/psforever/objects/vital/Vitality.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/Vitality.scala rename to src/main/scala/net/psforever/objects/vital/Vitality.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/VitalityDefinition.scala b/src/main/scala/net/psforever/objects/vital/VitalityDefinition.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/VitalityDefinition.scala rename to src/main/scala/net/psforever/objects/vital/VitalityDefinition.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala b/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/VitalsHistory.scala rename to src/main/scala/net/psforever/objects/vital/VitalsHistory.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/damage/DamageCalculations.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageCalculations.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/damage/DamageCalculations.scala rename to src/main/scala/net/psforever/objects/vital/damage/DamageCalculations.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala rename to src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala b/src/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala rename to src/main/scala/net/psforever/objects/vital/damage/DamageProfile.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala b/src/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala rename to src/main/scala/net/psforever/objects/vital/projectile/ProjectileCalculations.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala b/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala rename to src/main/scala/net/psforever/objects/vital/resistance/ResistanceCalculations.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala b/src/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala rename to src/main/scala/net/psforever/objects/vital/resistance/ResistanceProfile.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala b/src/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala rename to src/main/scala/net/psforever/objects/vital/resistance/ResistanceSelection.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resolution/DamageResistCalculations.scala b/src/main/scala/net/psforever/objects/vital/resolution/DamageResistCalculations.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resolution/DamageResistCalculations.scala rename to src/main/scala/net/psforever/objects/vital/resolution/DamageResistCalculations.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala b/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala rename to src/main/scala/net/psforever/objects/vital/resolution/ResolutionCalculations.scala diff --git a/common/src/main/scala/net/psforever/objects/vital/resolution/ResolutionSelection.scala b/src/main/scala/net/psforever/objects/vital/resolution/ResolutionSelection.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/vital/resolution/ResolutionSelection.scala rename to src/main/scala/net/psforever/objects/vital/resolution/ResolutionSelection.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala b/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala rename to src/main/scala/net/psforever/objects/zones/HotSpotInfo.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/MapInfo.scala b/src/main/scala/net/psforever/objects/zones/MapInfo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/MapInfo.scala rename to src/main/scala/net/psforever/objects/zones/MapInfo.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/MapScale.scala b/src/main/scala/net/psforever/objects/zones/MapScale.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/MapScale.scala rename to src/main/scala/net/psforever/objects/zones/MapScale.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala b/src/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala rename to src/main/scala/net/psforever/objects/zones/SphereOfInfluenceActor.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/Zone.scala b/src/main/scala/net/psforever/objects/zones/Zone.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/zones/Zone.scala rename to src/main/scala/net/psforever/objects/zones/Zone.scala index 4dfd9311..5f17e46b 100644 --- a/common/src/main/scala/net/psforever/objects/zones/Zone.scala +++ b/src/main/scala/net/psforever/objects/zones/Zone.scala @@ -21,9 +21,9 @@ import net.psforever.objects.serverobject.turret.FacilityTurret import net.psforever.objects.serverobject.zipline.ZipLinePath import net.psforever.types.{DriveState, PlanetSideEmpire, PlanetSideGUID, SpawnGroup, Vector3} import org.log4s.Logger -import services.avatar.AvatarService -import services.local.LocalService -import services.vehicle.VehicleService +import net.psforever.services.avatar.AvatarService +import net.psforever.services.local.LocalService +import net.psforever.services.vehicle.VehicleService import scala.collection.concurrent.TrieMap import scala.collection.mutable.ListBuffer diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneAware.scala b/src/main/scala/net/psforever/objects/zones/ZoneAware.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZoneAware.scala rename to src/main/scala/net/psforever/objects/zones/ZoneAware.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala rename to src/main/scala/net/psforever/objects/zones/ZoneDeployableActor.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala similarity index 96% rename from common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala rename to src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala index c3cc4627..0ebf2a28 100644 --- a/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala @@ -4,14 +4,15 @@ package net.psforever.objects.zones import akka.actor.Actor import net.psforever.objects.equipment.Equipment import net.psforever.types.PlanetSideGUID -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.annotation.tailrec import scala.collection.mutable.ListBuffer /** * na + * * @param equipmentOnGround a `List` of items (`Equipment`) dropped by players on the ground and can be collected again */ class ZoneGroundActor(zone: Zone, equipmentOnGround: ListBuffer[Equipment]) extends Actor { diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala similarity index 99% rename from common/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala rename to src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala index 50636f8e..4cd228f0 100644 --- a/common/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala @@ -4,7 +4,7 @@ package net.psforever.objects.zones import akka.actor.{Actor, ActorRef, Cancellable, Props} import net.psforever.objects.Default import net.psforever.types.{PlanetSideEmpire, Vector3} -import services.ServiceManager +import net.psforever.services.ServiceManager import scala.collection.mutable.ListBuffer import scala.concurrent.duration._ diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala b/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZoneInfo.scala rename to src/main/scala/net/psforever/objects/zones/ZoneInfo.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneMap.scala b/src/main/scala/net/psforever/objects/zones/ZoneMap.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZoneMap.scala rename to src/main/scala/net/psforever/objects/zones/ZoneMap.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala b/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala rename to src/main/scala/net/psforever/objects/zones/ZonePopulationActor.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala b/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala rename to src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala diff --git a/common/src/main/scala/net/psforever/objects/zones/Zoning.scala b/src/main/scala/net/psforever/objects/zones/Zoning.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/zones/Zoning.scala rename to src/main/scala/net/psforever/objects/zones/Zoning.scala diff --git a/common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala b/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala rename to src/main/scala/net/psforever/packet/ControlPacketOpcode.scala diff --git a/common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala b/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala rename to src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/src/main/scala/net/psforever/packet/GamePacketOpcode.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala rename to src/main/scala/net/psforever/packet/GamePacketOpcode.scala diff --git a/common/src/main/scala/net/psforever/packet/PSPacket.scala b/src/main/scala/net/psforever/packet/PSPacket.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/PSPacket.scala rename to src/main/scala/net/psforever/packet/PSPacket.scala diff --git a/common/src/main/scala/net/psforever/packet/PacketCoding.scala b/src/main/scala/net/psforever/packet/PacketCoding.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/PacketCoding.scala rename to src/main/scala/net/psforever/packet/PacketCoding.scala diff --git a/common/src/main/scala/net/psforever/packet/control/ClientStart.scala b/src/main/scala/net/psforever/packet/control/ClientStart.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/ClientStart.scala rename to src/main/scala/net/psforever/packet/control/ClientStart.scala diff --git a/common/src/main/scala/net/psforever/packet/control/ConnectionClose.scala b/src/main/scala/net/psforever/packet/control/ConnectionClose.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/ConnectionClose.scala rename to src/main/scala/net/psforever/packet/control/ConnectionClose.scala diff --git a/common/src/main/scala/net/psforever/packet/control/ControlSync.scala b/src/main/scala/net/psforever/packet/control/ControlSync.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/ControlSync.scala rename to src/main/scala/net/psforever/packet/control/ControlSync.scala diff --git a/common/src/main/scala/net/psforever/packet/control/ControlSyncResp.scala b/src/main/scala/net/psforever/packet/control/ControlSyncResp.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/ControlSyncResp.scala rename to src/main/scala/net/psforever/packet/control/ControlSyncResp.scala diff --git a/common/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala b/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala rename to src/main/scala/net/psforever/packet/control/HandleGamePacket.scala diff --git a/common/src/main/scala/net/psforever/packet/control/MultiPacket.scala b/src/main/scala/net/psforever/packet/control/MultiPacket.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/MultiPacket.scala rename to src/main/scala/net/psforever/packet/control/MultiPacket.scala diff --git a/common/src/main/scala/net/psforever/packet/control/MultiPacketCollector.scala b/src/main/scala/net/psforever/packet/control/MultiPacketCollector.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/MultiPacketCollector.scala rename to src/main/scala/net/psforever/packet/control/MultiPacketCollector.scala diff --git a/common/src/main/scala/net/psforever/packet/control/MultiPacketEx.scala b/src/main/scala/net/psforever/packet/control/MultiPacketEx.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/MultiPacketEx.scala rename to src/main/scala/net/psforever/packet/control/MultiPacketEx.scala diff --git a/common/src/main/scala/net/psforever/packet/control/RelatedA.scala b/src/main/scala/net/psforever/packet/control/RelatedA.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/RelatedA.scala rename to src/main/scala/net/psforever/packet/control/RelatedA.scala diff --git a/common/src/main/scala/net/psforever/packet/control/RelatedB.scala b/src/main/scala/net/psforever/packet/control/RelatedB.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/RelatedB.scala rename to src/main/scala/net/psforever/packet/control/RelatedB.scala diff --git a/common/src/main/scala/net/psforever/packet/control/ServerStart.scala b/src/main/scala/net/psforever/packet/control/ServerStart.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/ServerStart.scala rename to src/main/scala/net/psforever/packet/control/ServerStart.scala diff --git a/common/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala b/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala rename to src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala diff --git a/common/src/main/scala/net/psforever/packet/control/TeardownConnection.scala b/src/main/scala/net/psforever/packet/control/TeardownConnection.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/control/TeardownConnection.scala rename to src/main/scala/net/psforever/packet/control/TeardownConnection.scala diff --git a/common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala b/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala similarity index 94% rename from common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala rename to src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala index 116093d2..bd39e77b 100644 --- a/common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala +++ b/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala @@ -19,7 +19,7 @@ object ClientChallengeXchg extends Marshallable[ClientChallengeXchg] { ("client_time" | uint32L) :: ("challenge" | bytes(12)) :: ("end_chal?" | constant(0)) :: - ("objects?" | constant(1)) :: + ("objects" | constant(1)) :: ("object_type?" | constant(hex"0002".bits)) :: ("unknown" | constant(hex"ff240000".bits)) :: ("P_len" | constant(hex"1000".bits)) :: @@ -28,7 +28,7 @@ object ClientChallengeXchg extends Marshallable[ClientChallengeXchg] { ("G" | bytes(16)) :: ("end?" | constant(0)) :: ("end?" | constant(0)) :: - ("objects?" | constant(1)) :: + ("objects" | constant(1)) :: ("unknown" | constant(hex"03070000".bits)) :: ("end?" | constant(0)) ).as[ClientChallengeXchg] diff --git a/common/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala b/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala rename to src/main/scala/net/psforever/packet/crypto/ClientFinished.scala diff --git a/common/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala b/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala rename to src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala diff --git a/common/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala b/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala rename to src/main/scala/net/psforever/packet/crypto/ServerFinished.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala b/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala rename to src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ActionProgressMessage.scala b/src/main/scala/net/psforever/packet/game/ActionProgressMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ActionProgressMessage.scala rename to src/main/scala/net/psforever/packet/game/ActionProgressMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ActionResultMessage.scala b/src/main/scala/net/psforever/packet/game/ActionResultMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ActionResultMessage.scala rename to src/main/scala/net/psforever/packet/game/ActionResultMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala b/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala rename to src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarDeadStateMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarDeadStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarDeadStateMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarDeadStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarJumpMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarJumpMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarJumpMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarJumpMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarStatisticsMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala b/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala rename to src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala b/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala rename to src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BattleplanMessage.scala b/src/main/scala/net/psforever/packet/game/BattleplanMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BattleplanMessage.scala rename to src/main/scala/net/psforever/packet/game/BattleplanMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BeginZoningMessage.scala b/src/main/scala/net/psforever/packet/game/BeginZoningMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BeginZoningMessage.scala rename to src/main/scala/net/psforever/packet/game/BeginZoningMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BindPlayerMessage.scala b/src/main/scala/net/psforever/packet/game/BindPlayerMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BindPlayerMessage.scala rename to src/main/scala/net/psforever/packet/game/BindPlayerMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BroadcastWarpgateUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/BroadcastWarpgateUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BroadcastWarpgateUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/BroadcastWarpgateUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BugReportMessage.scala b/src/main/scala/net/psforever/packet/game/BugReportMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BugReportMessage.scala rename to src/main/scala/net/psforever/packet/game/BugReportMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/BuildingInfoUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/BuildingInfoUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/BuildingInfoUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/BuildingInfoUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala b/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala rename to src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChainLashMessage.scala b/src/main/scala/net/psforever/packet/game/ChainLashMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChainLashMessage.scala rename to src/main/scala/net/psforever/packet/game/ChainLashMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala b/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala rename to src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala b/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala rename to src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala b/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala rename to src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala b/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala rename to src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala b/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala rename to src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterCreateRequestMessage.scala b/src/main/scala/net/psforever/packet/game/CharacterCreateRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CharacterCreateRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/CharacterCreateRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala b/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala b/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala rename to src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterNoRecordMessage.scala b/src/main/scala/net/psforever/packet/game/CharacterNoRecordMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CharacterNoRecordMessage.scala rename to src/main/scala/net/psforever/packet/game/CharacterNoRecordMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterRequestMessage.scala b/src/main/scala/net/psforever/packet/game/CharacterRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CharacterRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/CharacterRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChatMsg.scala b/src/main/scala/net/psforever/packet/game/ChatMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChatMsg.scala rename to src/main/scala/net/psforever/packet/game/ChatMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala b/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala rename to src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala b/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala rename to src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala b/src/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ContinentalLockUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/ContinentalLockUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ContinentalLockUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/ContinentalLockUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala b/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala rename to src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala b/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala rename to src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala b/src/main/scala/net/psforever/packet/game/DamageMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DamageMessage.scala rename to src/main/scala/net/psforever/packet/game/DamageMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DamageWithPositionMessage.scala b/src/main/scala/net/psforever/packet/game/DamageWithPositionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DamageWithPositionMessage.scala rename to src/main/scala/net/psforever/packet/game/DamageWithPositionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DataChallenge.scala b/src/main/scala/net/psforever/packet/game/DataChallenge.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DataChallenge.scala rename to src/main/scala/net/psforever/packet/game/DataChallenge.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DataChallengeMessage.scala b/src/main/scala/net/psforever/packet/game/DataChallengeMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DataChallengeMessage.scala rename to src/main/scala/net/psforever/packet/game/DataChallengeMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DataChallengeMessageResp.scala b/src/main/scala/net/psforever/packet/game/DataChallengeMessageResp.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DataChallengeMessageResp.scala rename to src/main/scala/net/psforever/packet/game/DataChallengeMessageResp.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala b/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala rename to src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DensityLevelUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/DensityLevelUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DensityLevelUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/DensityLevelUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala b/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala rename to src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala b/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala b/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala b/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala rename to src/main/scala/net/psforever/packet/game/DestroyDisplayMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala b/src/main/scala/net/psforever/packet/game/DestroyMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala rename to src/main/scala/net/psforever/packet/game/DestroyMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DisconnectMessage.scala b/src/main/scala/net/psforever/packet/game/DisconnectMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DisconnectMessage.scala rename to src/main/scala/net/psforever/packet/game/DisconnectMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala b/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala rename to src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala b/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala rename to src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala b/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala rename to src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala b/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala rename to src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala b/src/main/scala/net/psforever/packet/game/DropItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala rename to src/main/scala/net/psforever/packet/game/DropItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/DroppodFreefallingMessage.scala b/src/main/scala/net/psforever/packet/game/DroppodFreefallingMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/DroppodFreefallingMessage.scala rename to src/main/scala/net/psforever/packet/game/DroppodFreefallingMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala b/src/main/scala/net/psforever/packet/game/EmoteMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala rename to src/main/scala/net/psforever/packet/game/EmoteMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ExperienceAddedMessage.scala b/src/main/scala/net/psforever/packet/game/ExperienceAddedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ExperienceAddedMessage.scala rename to src/main/scala/net/psforever/packet/game/ExperienceAddedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala b/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala b/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala rename to src/main/scala/net/psforever/packet/game/FavoritesMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala b/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala rename to src/main/scala/net/psforever/packet/game/FavoritesRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala b/src/main/scala/net/psforever/packet/game/FireHintMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala rename to src/main/scala/net/psforever/packet/game/FireHintMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala b/src/main/scala/net/psforever/packet/game/FriendsRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FriendsRequest.scala rename to src/main/scala/net/psforever/packet/game/FriendsRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala b/src/main/scala/net/psforever/packet/game/FriendsResponse.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala rename to src/main/scala/net/psforever/packet/game/FriendsResponse.scala diff --git a/common/src/main/scala/net/psforever/packet/game/GenericActionMessage.scala b/src/main/scala/net/psforever/packet/game/GenericActionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/GenericActionMessage.scala rename to src/main/scala/net/psforever/packet/game/GenericActionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala b/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala rename to src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala b/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala rename to src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala b/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala rename to src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/HackMessage.scala b/src/main/scala/net/psforever/packet/game/HackMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/HackMessage.scala rename to src/main/scala/net/psforever/packet/game/HackMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/HitHint.scala b/src/main/scala/net/psforever/packet/game/HitHint.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/HitHint.scala rename to src/main/scala/net/psforever/packet/game/HitHint.scala diff --git a/common/src/main/scala/net/psforever/packet/game/HitMessage.scala b/src/main/scala/net/psforever/packet/game/HitMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/HitMessage.scala rename to src/main/scala/net/psforever/packet/game/HitMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/HotSpotUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/HotSpotUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/HotSpotUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/HotSpotUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala b/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala rename to src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala b/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala rename to src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala b/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala rename to src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/KeepAliveMessage.scala b/src/main/scala/net/psforever/packet/game/KeepAliveMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/KeepAliveMessage.scala rename to src/main/scala/net/psforever/packet/game/KeepAliveMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/LashMessage.scala b/src/main/scala/net/psforever/packet/game/LashMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/LashMessage.scala rename to src/main/scala/net/psforever/packet/game/LashMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/LoadMapMessage.scala b/src/main/scala/net/psforever/packet/game/LoadMapMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/LoadMapMessage.scala rename to src/main/scala/net/psforever/packet/game/LoadMapMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/LoginMessage.scala b/src/main/scala/net/psforever/packet/game/LoginMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/LoginMessage.scala rename to src/main/scala/net/psforever/packet/game/LoginMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala b/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala rename to src/main/scala/net/psforever/packet/game/LoginRespMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala b/src/main/scala/net/psforever/packet/game/LootItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala rename to src/main/scala/net/psforever/packet/game/LootItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/MailMessage.scala b/src/main/scala/net/psforever/packet/game/MailMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/MailMessage.scala rename to src/main/scala/net/psforever/packet/game/MailMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala b/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala rename to src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala b/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala rename to src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala b/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala rename to src/main/scala/net/psforever/packet/game/MoveItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDeployedMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectDeployedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectDeployedMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectDeployedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala b/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala rename to src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala b/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala rename to src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala b/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala rename to src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala b/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala rename to src/main/scala/net/psforever/packet/game/PickupItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PingMsg.scala b/src/main/scala/net/psforever/packet/game/PingMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PingMsg.scala rename to src/main/scala/net/psforever/packet/game/PingMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala b/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala rename to src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala b/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala rename to src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala b/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala rename to src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala b/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala rename to src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala b/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala rename to src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStateShiftMessage.scala b/src/main/scala/net/psforever/packet/game/PlayerStateShiftMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PlayerStateShiftMessage.scala rename to src/main/scala/net/psforever/packet/game/PlayerStateShiftMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala b/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala rename to src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/PropertyOverrideMessage.scala b/src/main/scala/net/psforever/packet/game/PropertyOverrideMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/PropertyOverrideMessage.scala rename to src/main/scala/net/psforever/packet/game/PropertyOverrideMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala b/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala rename to src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ReleaseAvatarRequestMessage.scala b/src/main/scala/net/psforever/packet/game/ReleaseAvatarRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ReleaseAvatarRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/ReleaseAvatarRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala b/src/main/scala/net/psforever/packet/game/ReloadMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala rename to src/main/scala/net/psforever/packet/game/ReloadMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/RepairMessage.scala b/src/main/scala/net/psforever/packet/game/RepairMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/RepairMessage.scala rename to src/main/scala/net/psforever/packet/game/RepairMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala b/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala rename to src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala b/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala rename to src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala b/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ServerVehicleOverrideMsg.scala b/src/main/scala/net/psforever/packet/game/ServerVehicleOverrideMsg.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ServerVehicleOverrideMsg.scala rename to src/main/scala/net/psforever/packet/game/ServerVehicleOverrideMsg.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SetChatFilterMessage.scala b/src/main/scala/net/psforever/packet/game/SetChatFilterMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SetChatFilterMessage.scala rename to src/main/scala/net/psforever/packet/game/SetChatFilterMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala b/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala rename to src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala b/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala rename to src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SimDataChallenge.scala b/src/main/scala/net/psforever/packet/game/SimDataChallenge.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SimDataChallenge.scala rename to src/main/scala/net/psforever/packet/game/SimDataChallenge.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SimDataChallengeResp.scala b/src/main/scala/net/psforever/packet/game/SimDataChallengeResp.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SimDataChallengeResp.scala rename to src/main/scala/net/psforever/packet/game/SimDataChallengeResp.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SpawnRequestMessage.scala b/src/main/scala/net/psforever/packet/game/SpawnRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SpawnRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/SpawnRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala b/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala rename to src/main/scala/net/psforever/packet/game/SplashHitMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala b/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala rename to src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala b/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala rename to src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadMemberEvent.scala b/src/main/scala/net/psforever/packet/game/SquadMemberEvent.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadMemberEvent.scala rename to src/main/scala/net/psforever/packet/game/SquadMemberEvent.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadMembershipRequest.scala b/src/main/scala/net/psforever/packet/game/SquadMembershipRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadMembershipRequest.scala rename to src/main/scala/net/psforever/packet/game/SquadMembershipRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadMembershipResponse.scala b/src/main/scala/net/psforever/packet/game/SquadMembershipResponse.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadMembershipResponse.scala rename to src/main/scala/net/psforever/packet/game/SquadMembershipResponse.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadState.scala b/src/main/scala/net/psforever/packet/game/SquadState.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadState.scala rename to src/main/scala/net/psforever/packet/game/SquadState.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadWaypointEvent.scala b/src/main/scala/net/psforever/packet/game/SquadWaypointEvent.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadWaypointEvent.scala rename to src/main/scala/net/psforever/packet/game/SquadWaypointEvent.scala diff --git a/common/src/main/scala/net/psforever/packet/game/SquadWaypointRequest.scala b/src/main/scala/net/psforever/packet/game/SquadWaypointRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/SquadWaypointRequest.scala rename to src/main/scala/net/psforever/packet/game/SquadWaypointRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala b/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala rename to src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala b/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TimeOfDayMessage.scala b/src/main/scala/net/psforever/packet/game/TimeOfDayMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TimeOfDayMessage.scala rename to src/main/scala/net/psforever/packet/game/TimeOfDayMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala b/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala rename to src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala b/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala rename to src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala b/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala rename to src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/TriggerSoundMessage.scala b/src/main/scala/net/psforever/packet/game/TriggerSoundMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/TriggerSoundMessage.scala rename to src/main/scala/net/psforever/packet/game/TriggerSoundMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala b/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala rename to src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala b/src/main/scala/net/psforever/packet/game/UseItemMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala rename to src/main/scala/net/psforever/packet/game/UseItemMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala b/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala rename to src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala b/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala rename to src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala b/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala rename to src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala b/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala rename to src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VoiceHostKill.scala b/src/main/scala/net/psforever/packet/game/VoiceHostKill.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VoiceHostKill.scala rename to src/main/scala/net/psforever/packet/game/VoiceHostKill.scala diff --git a/common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala b/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala rename to src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala b/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala rename to src/main/scala/net/psforever/packet/game/WarpgateRequest.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala b/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala rename to src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala b/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala rename to src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala b/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala rename to src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala b/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala rename to src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala b/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala rename to src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/WeatherMessage.scala b/src/main/scala/net/psforever/packet/game/WeatherMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/WeatherMessage.scala rename to src/main/scala/net/psforever/packet/game/WeatherMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala b/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala rename to src/main/scala/net/psforever/packet/game/ZipLineMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ZoneForcedCavernConnectionsMessage.scala b/src/main/scala/net/psforever/packet/game/ZoneForcedCavernConnectionsMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ZoneForcedCavernConnectionsMessage.scala rename to src/main/scala/net/psforever/packet/game/ZoneForcedCavernConnectionsMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ZoneInfoMessage.scala b/src/main/scala/net/psforever/packet/game/ZoneInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ZoneInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/ZoneInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ZoneLockInfoMessage.scala b/src/main/scala/net/psforever/packet/game/ZoneLockInfoMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ZoneLockInfoMessage.scala rename to src/main/scala/net/psforever/packet/game/ZoneLockInfoMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/ZonePopulationUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/ZonePopulationUpdateMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/ZonePopulationUpdateMessage.scala rename to src/main/scala/net/psforever/packet/game/ZonePopulationUpdateMessage.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/AegisShieldGeneratorData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/AegisShieldGeneratorData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/AegisShieldGeneratorData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/AegisShieldGeneratorData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/BasicCharacterData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/BasicCharacterData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/BasicCharacterData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/BasicCharacterData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CaptureFlagData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/CaptureFlagData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/CaptureFlagData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/CaptureFlagData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/CharacterData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/CharacterData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala b/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/ConstructorData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ConstructorData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/ConstructorData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/ConstructorData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DestroyedVehicleData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DestroyedVehicleData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DestroyedVehicleData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DestroyedVehicleData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCharacterData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCharacterData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCharacterData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedCharacterData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCommandDetonaterData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCommandDetonaterData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedCommandDetonaterData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedCommandDetonaterData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedConstructionToolData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedConstructionToolData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedConstructionToolData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedConstructionToolData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedREKData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedREKData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedREKData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedREKData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DrawnSlot.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DroppedItemData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DroppedItemData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DroppedItemData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DroppedItemData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DroppodData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/DroppodData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/DroppodData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/DroppodData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/HandheldData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/HandheldData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/HandheldData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/HandheldData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala b/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/InventoryData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/InventoryData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/LargeDeployableData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/LargeDeployableData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/LargeDeployableData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/LargeDeployableData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/LockerContainerData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/LockerContainerData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/LockerContainerData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/LockerContainerData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala b/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala similarity index 99% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala index 6acde220..5f9f6074 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala @@ -450,9 +450,10 @@ object ObjectClass { //TODO refactor the following functions into another object later /** * Given an object class, retrieve the `Codec` used to parse and translate the constructor data for that type. - * This function services `0x18` `ObjectCreateDetailedMessage` packet data.
+ * This function net.psforever.services `0x18` `ObjectCreateDetailedMessage` packet data.
*
* All `Codec`s accessible by this function assume the object is perfectly visible from the perspective of the avatar. + * * @param objClass the code for the type of object being constructed * @return the `Codec` that handles the format of data for that particular item class, or a failing `Codec` * @see `ConstructorData` @@ -746,9 +747,10 @@ object ObjectClass { /** * Given an object class, retrieve the `Codec` used to parse and translate the constructor data for that type. - * This function services `0x17` `ObjectCreateMessage` packet data.
+ * This function net.psforever.services `0x17` `ObjectCreateMessage` packet data.
*
* All `Codec`s accessible by this function assume the object has parent data. + * * @param objClass the code for the type of object being constructed * @return the `Codec` that handles the format of data for that particular item class, or a failing `Codec` * @see `ConstructorData` @@ -1049,9 +1051,10 @@ object ObjectClass { /** * Given an object class, retrieve the `Codec` used to parse and translate the constructor data for that type. - * This function services `0x17` `ObjectCreateMessage` packet data.
+ * This function net.psforever.services `0x17` `ObjectCreateMessage` packet data.
*
* All `Codec`s accessible by this function assume the object has no parent data and is on the ground. + * * @param objClass the code for the type of object being constructed * @return the `Codec` that handles the format of data for that particular item class, or a failing `Codec` * @see `ConstructorData` diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/OrbitalShuttleData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/OrbitalShuttleData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/OrbitalShuttleData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/OrbitalShuttleData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/PlacementData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/PlacementData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/PlacementData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/PlacementData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/PlayerData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/PlayerData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/PlayerData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/PlayerData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala b/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/REKData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/REKData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/REKData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/REKData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/RemoteProjectileData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/RemoteProjectileData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/RemoteProjectileData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/RemoteProjectileData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/RibbonBars.scala b/src/main/scala/net/psforever/packet/game/objectcreate/RibbonBars.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/RibbonBars.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/RibbonBars.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/StreamBitSize.scala b/src/main/scala/net/psforever/packet/game/objectcreate/StreamBitSize.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/StreamBitSize.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/StreamBitSize.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/TRAPData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/TRAPData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/TRAPData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/TRAPData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/TelepadDeployableData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/TelepadDeployableData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/TelepadDeployableData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/TelepadDeployableData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala rename to src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala diff --git a/common/src/main/scala/net/psforever/persistence/Account.scala b/src/main/scala/net/psforever/persistence/Account.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Account.scala rename to src/main/scala/net/psforever/persistence/Account.scala diff --git a/common/src/main/scala/net/psforever/persistence/Avatar.scala b/src/main/scala/net/psforever/persistence/Avatar.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Avatar.scala rename to src/main/scala/net/psforever/persistence/Avatar.scala diff --git a/common/src/main/scala/net/psforever/persistence/Building.scala b/src/main/scala/net/psforever/persistence/Building.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Building.scala rename to src/main/scala/net/psforever/persistence/Building.scala diff --git a/common/src/main/scala/net/psforever/persistence/Certification.scala b/src/main/scala/net/psforever/persistence/Certification.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Certification.scala rename to src/main/scala/net/psforever/persistence/Certification.scala diff --git a/common/src/main/scala/net/psforever/persistence/Implant.scala b/src/main/scala/net/psforever/persistence/Implant.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Implant.scala rename to src/main/scala/net/psforever/persistence/Implant.scala diff --git a/common/src/main/scala/net/psforever/persistence/Loadout.scala b/src/main/scala/net/psforever/persistence/Loadout.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Loadout.scala rename to src/main/scala/net/psforever/persistence/Loadout.scala diff --git a/common/src/main/scala/net/psforever/persistence/Locker.scala b/src/main/scala/net/psforever/persistence/Locker.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Locker.scala rename to src/main/scala/net/psforever/persistence/Locker.scala diff --git a/common/src/main/scala/net/psforever/persistence/Login.scala b/src/main/scala/net/psforever/persistence/Login.scala similarity index 100% rename from common/src/main/scala/net/psforever/persistence/Login.scala rename to src/main/scala/net/psforever/persistence/Login.scala diff --git a/common/src/main/scala/services/InterstellarClusterService.scala b/src/main/scala/net/psforever/services/InterstellarClusterService.scala similarity index 99% rename from common/src/main/scala/services/InterstellarClusterService.scala rename to src/main/scala/net/psforever/services/InterstellarClusterService.scala index 6ebf841f..4dc4add5 100644 --- a/common/src/main/scala/services/InterstellarClusterService.scala +++ b/src/main/scala/net/psforever/services/InterstellarClusterService.scala @@ -1,4 +1,4 @@ -package services +package net.psforever.services import akka.actor.typed.receptionist.{Receptionist, ServiceKey} import akka.actor.typed.scaladsl.{AbstractBehavior, ActorContext, Behaviors} diff --git a/common/src/main/scala/services/RemoverActor.scala b/src/main/scala/net/psforever/services/RemoverActor.scala similarity index 99% rename from common/src/main/scala/services/RemoverActor.scala rename to src/main/scala/net/psforever/services/RemoverActor.scala index 5ea8c748..6e68e7ca 100644 --- a/common/src/main/scala/services/RemoverActor.scala +++ b/src/main/scala/net/psforever/services/RemoverActor.scala @@ -1,12 +1,12 @@ // Copyright (c) 2017 PSForever -package services +package net.psforever.services import akka.actor.{ActorRef, Cancellable} import net.psforever.objects.guid.TaskResolver import net.psforever.objects.zones.Zone import net.psforever.objects.{Default, PlanetSideGameObject} import net.psforever.types.Vector3 -import services.support.{SimilarityComparator, SupportActor, SupportActorCaseConversions} +import net.psforever.services.support.{SimilarityComparator, SupportActor, SupportActorCaseConversions} import scala.concurrent.duration._ import scala.util.Success diff --git a/common/src/main/scala/services/Service.scala b/src/main/scala/net/psforever/services/Service.scala similarity index 96% rename from common/src/main/scala/services/Service.scala rename to src/main/scala/net/psforever/services/Service.scala index f5cdf0d2..48d7a2f5 100644 --- a/common/src/main/scala/services/Service.scala +++ b/src/main/scala/net/psforever/services/Service.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services +package net.psforever.services import akka.event.{ActorEventBus, SubchannelClassification} import akka.util.Subclassification @@ -9,6 +9,7 @@ object Service { final val defaultPlayerGUID: PlanetSideGUID = PlanetSideGUID(0) final case class Startup() + final case class Join(channel: String) final case class Leave(channel: Option[String] = None) final case class LeaveAll() diff --git a/common/src/main/scala/services/ServiceManager.scala b/src/main/scala/net/psforever/services/ServiceManager.scala similarity index 98% rename from common/src/main/scala/services/ServiceManager.scala rename to src/main/scala/net/psforever/services/ServiceManager.scala index 9d5f8bfc..22a4110e 100644 --- a/common/src/main/scala/services/ServiceManager.scala +++ b/src/main/scala/net/psforever/services/ServiceManager.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services +package net.psforever.services import akka.actor.{Actor, ActorIdentity, ActorRef, ActorSystem, Identify, Props} import akka.actor.typed.scaladsl.adapter._ diff --git a/common/src/main/scala/services/account/AccountIntermediaryService.scala b/src/main/scala/net/psforever/services/account/AccountIntermediaryService.scala similarity index 98% rename from common/src/main/scala/services/account/AccountIntermediaryService.scala rename to src/main/scala/net/psforever/services/account/AccountIntermediaryService.scala index 6310a8e8..ea619aca 100644 --- a/common/src/main/scala/services/account/AccountIntermediaryService.scala +++ b/src/main/scala/net/psforever/services/account/AccountIntermediaryService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account import scala.collection.mutable import akka.actor.Actor diff --git a/common/src/main/scala/services/account/AccountPersistenceService.scala b/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala similarity index 98% rename from common/src/main/scala/services/account/AccountPersistenceService.scala rename to src/main/scala/net/psforever/services/account/AccountPersistenceService.scala index b6a8bd04..8244da1f 100644 --- a/common/src/main/scala/services/account/AccountPersistenceService.scala +++ b/src/main/scala/net/psforever/services/account/AccountPersistenceService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2020 PSForever -package services.account +package net.psforever.services.account import akka.actor.{Actor, ActorRef, Cancellable, Props} @@ -12,8 +12,8 @@ import net.psforever.objects.avatar.Avatar import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.zones.Zone import net.psforever.types.Vector3 -import services.{Service, ServiceManager} -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.{Service, ServiceManager} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} /** * A global service that manages user behavior as divided into the following three categories: @@ -21,7 +21,7 @@ import services.avatar.{AvatarAction, AvatarServiceMessage} * relogging (short-term client connectivity issue resolution), and * logout (end-of-life conditions involving the separation of a user from the game world).
*
- * A user polls this service and the services either creates a new `PersistenceMonitor` entity + * A user polls this service and the net.psforever.services either creates a new `PersistenceMonitor` entity * or returns whatever `PersistenceMonitor` entity currently exists. * Performing informative pdates to the monitor about the user's eventual player avatar instance * (which can be performed by messaging the service indirectly, diff --git a/src/main/scala/net/psforever/services/account/IPAddress.scala b/src/main/scala/net/psforever/services/account/IPAddress.scala new file mode 100644 index 00000000..f7e3e8b8 --- /dev/null +++ b/src/main/scala/net/psforever/services/account/IPAddress.scala @@ -0,0 +1,14 @@ +// Copyright (c) 2017 PSForever +package net.psforever.services.account + +import java.net.InetSocketAddress + +class IPAddress(private val address: InetSocketAddress) { + def Address: String = address.getAddress.getHostAddress + + def CanonicalHostName: String = address.getAddress.getCanonicalHostName + + def HostName: String = address.getAddress.getHostName + + def Port: Int = address.getPort +} diff --git a/common/src/main/scala/services/account/ReceiveAccountData.scala b/src/main/scala/net/psforever/services/account/ReceiveAccountData.scala similarity index 76% rename from common/src/main/scala/services/account/ReceiveAccountData.scala rename to src/main/scala/net/psforever/services/account/ReceiveAccountData.scala index a6221a8d..92289621 100644 --- a/common/src/main/scala/services/account/ReceiveAccountData.scala +++ b/src/main/scala/net/psforever/services/account/ReceiveAccountData.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account import net.psforever.objects.Account diff --git a/common/src/main/scala/services/account/ReceiveIPAddress.scala b/src/main/scala/net/psforever/services/account/ReceiveIPAddress.scala similarity index 69% rename from common/src/main/scala/services/account/ReceiveIPAddress.scala rename to src/main/scala/net/psforever/services/account/ReceiveIPAddress.scala index a8b4aaf6..34eff94e 100644 --- a/common/src/main/scala/services/account/ReceiveIPAddress.scala +++ b/src/main/scala/net/psforever/services/account/ReceiveIPAddress.scala @@ -1,4 +1,4 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account final case class ReceiveIPAddress(address: IPAddress) diff --git a/common/src/main/scala/services/account/RetrieveAccountData.scala b/src/main/scala/net/psforever/services/account/RetrieveAccountData.scala similarity index 68% rename from common/src/main/scala/services/account/RetrieveAccountData.scala rename to src/main/scala/net/psforever/services/account/RetrieveAccountData.scala index a482118e..b2deecd3 100644 --- a/common/src/main/scala/services/account/RetrieveAccountData.scala +++ b/src/main/scala/net/psforever/services/account/RetrieveAccountData.scala @@ -1,4 +1,4 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account final case class RetrieveAccountData(token: String) diff --git a/common/src/main/scala/services/account/RetrieveIPAddress.scala b/src/main/scala/net/psforever/services/account/RetrieveIPAddress.scala similarity index 68% rename from common/src/main/scala/services/account/RetrieveIPAddress.scala rename to src/main/scala/net/psforever/services/account/RetrieveIPAddress.scala index 11275307..5a2a0c0a 100644 --- a/common/src/main/scala/services/account/RetrieveIPAddress.scala +++ b/src/main/scala/net/psforever/services/account/RetrieveIPAddress.scala @@ -1,4 +1,4 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account final case class RetrieveIPAddress(sessionID: Long) diff --git a/common/src/main/scala/services/account/StoreAccountData.scala b/src/main/scala/net/psforever/services/account/StoreAccountData.scala similarity index 77% rename from common/src/main/scala/services/account/StoreAccountData.scala rename to src/main/scala/net/psforever/services/account/StoreAccountData.scala index a2572980..57ef9d3c 100644 --- a/common/src/main/scala/services/account/StoreAccountData.scala +++ b/src/main/scala/net/psforever/services/account/StoreAccountData.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account import net.psforever.objects.Account diff --git a/common/src/main/scala/services/account/StoreIPAddress.scala b/src/main/scala/net/psforever/services/account/StoreIPAddress.scala similarity index 72% rename from common/src/main/scala/services/account/StoreIPAddress.scala rename to src/main/scala/net/psforever/services/account/StoreIPAddress.scala index 4ea4b003..5ec65ef8 100644 --- a/common/src/main/scala/services/account/StoreIPAddress.scala +++ b/src/main/scala/net/psforever/services/account/StoreIPAddress.scala @@ -1,4 +1,4 @@ // Copyright (c) 2017 PSForever -package services.account +package net.psforever.services.account final case class StoreIPAddress(sessionID: Long, address: IPAddress) diff --git a/common/src/main/scala/services/avatar/AvatarService.scala b/src/main/scala/net/psforever/services/avatar/AvatarService.scala similarity index 98% rename from common/src/main/scala/services/avatar/AvatarService.scala rename to src/main/scala/net/psforever/services/avatar/AvatarService.scala index e814afa8..20d07815 100644 --- a/common/src/main/scala/services/avatar/AvatarService.scala +++ b/src/main/scala/net/psforever/services/avatar/AvatarService.scala @@ -1,13 +1,13 @@ // Copyright (c) 2017 PSForever -package services.avatar +package net.psforever.services.avatar import akka.actor.{Actor, ActorRef, Props} import net.psforever.objects.zones.Zone import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate.{DroppedItemData, ObjectCreateMessageParent, PlacementData} import net.psforever.types.PlanetSideGUID -import services.avatar.support.{CorpseRemovalActor, DroppedItemRemover} -import services.{GenericEventBus, RemoverActor, Service} +import net.psforever.services.avatar.support.{CorpseRemovalActor, DroppedItemRemover} +import net.psforever.services.{GenericEventBus, RemoverActor, Service} class AvatarService(zone: Zone) extends Actor { private val undertaker: ActorRef = context.actorOf(Props[CorpseRemovalActor](), s"${zone.id}-corpse-removal-agent") diff --git a/common/src/main/scala/services/avatar/AvatarServiceMessage.scala b/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala similarity index 99% rename from common/src/main/scala/services/avatar/AvatarServiceMessage.scala rename to src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala index 3da31bdc..f41ea898 100644 --- a/common/src/main/scala/services/avatar/AvatarServiceMessage.scala +++ b/src/main/scala/net/psforever/services/avatar/AvatarServiceMessage.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.avatar +package net.psforever.services.avatar import net.psforever.objects.{PlanetSideGameObject, Player} import net.psforever.objects.ballistics.{Projectile, SourceEntry} diff --git a/common/src/main/scala/services/avatar/AvatarServiceResponse.scala b/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala similarity index 98% rename from common/src/main/scala/services/avatar/AvatarServiceResponse.scala rename to src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala index 38c405c9..86f1497d 100644 --- a/common/src/main/scala/services/avatar/AvatarServiceResponse.scala +++ b/src/main/scala/net/psforever/services/avatar/AvatarServiceResponse.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.avatar +package net.psforever.services.avatar import net.psforever.objects.Player import net.psforever.objects.ballistics.{Projectile, SourceEntry} @@ -9,7 +9,7 @@ import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.ConstructorData import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types.{ExoSuitType, PlanetSideEmpire, PlanetSideGUID, TransactionType, Vector3} -import services.GenericEventBusMsg +import net.psforever.services.GenericEventBusMsg final case class AvatarServiceResponse( channel: String, diff --git a/common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala b/src/main/scala/net/psforever/services/avatar/support/CorpseRemovalActor.scala similarity index 87% rename from common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala rename to src/main/scala/net/psforever/services/avatar/support/CorpseRemovalActor.scala index fecfbd14..70dece51 100644 --- a/common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala +++ b/src/main/scala/net/psforever/services/avatar/support/CorpseRemovalActor.scala @@ -1,11 +1,11 @@ // Copyright (c) 2017 PSForever -package services.avatar.support +package net.psforever.services.avatar.support import net.psforever.objects.guid.{GUIDTask, TaskResolver} import net.psforever.objects.Player import net.psforever.types.ExoSuitType -import services.{RemoverActor, Service} -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.{RemoverActor, Service} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala b/src/main/scala/net/psforever/services/avatar/support/DroppedItemRemover.scala similarity index 86% rename from common/src/main/scala/services/avatar/support/DroppedItemRemover.scala rename to src/main/scala/net/psforever/services/avatar/support/DroppedItemRemover.scala index 56fae08c..e389e50b 100644 --- a/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala +++ b/src/main/scala/net/psforever/services/avatar/support/DroppedItemRemover.scala @@ -1,10 +1,10 @@ // Copyright (c) 2017 PSForever -package services.avatar.support +package net.psforever.services.avatar.support import net.psforever.objects.equipment.Equipment import net.psforever.objects.guid.{GUIDTask, TaskResolver} -import services.{RemoverActor, Service} -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.{RemoverActor, Service} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/chat/ChatService.scala b/src/main/scala/net/psforever/services/chat/ChatService.scala similarity index 99% rename from common/src/main/scala/services/chat/ChatService.scala rename to src/main/scala/net/psforever/services/chat/ChatService.scala index 460d070a..bcaacbc7 100644 --- a/common/src/main/scala/services/chat/ChatService.scala +++ b/src/main/scala/net/psforever/services/chat/ChatService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.chat +package net.psforever.services.chat import akka.actor.typed.receptionist.{Receptionist, ServiceKey} import akka.actor.typed.{ActorRef, Behavior} diff --git a/common/src/main/scala/services/galaxy/GalaxyService.scala b/src/main/scala/net/psforever/services/galaxy/GalaxyService.scala similarity index 95% rename from common/src/main/scala/services/galaxy/GalaxyService.scala rename to src/main/scala/net/psforever/services/galaxy/GalaxyService.scala index dd3edb64..678f99a5 100644 --- a/common/src/main/scala/services/galaxy/GalaxyService.scala +++ b/src/main/scala/net/psforever/services/galaxy/GalaxyService.scala @@ -1,10 +1,10 @@ // Copyright (c) 2017 PSForever -package services.galaxy +package net.psforever.services.galaxy import akka.actor.Actor import net.psforever.objects.zones.Zone import net.psforever.packet.game.BuildingInfoUpdateMessage -import services.{GenericEventBus, Service} +import net.psforever.services.{GenericEventBus, Service} class GalaxyService extends Actor { private[this] val log = org.log4s.getLogger diff --git a/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala b/src/main/scala/net/psforever/services/galaxy/GalaxyServiceMessage.scala similarity index 95% rename from common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala rename to src/main/scala/net/psforever/services/galaxy/GalaxyServiceMessage.scala index 8840deae..28c27205 100644 --- a/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala +++ b/src/main/scala/net/psforever/services/galaxy/GalaxyServiceMessage.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.galaxy +package net.psforever.services.galaxy import net.psforever.objects.Vehicle import net.psforever.objects.vehicles.VehicleManifest diff --git a/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala b/src/main/scala/net/psforever/services/galaxy/GalaxyServiceResponse.scala similarity index 90% rename from common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala rename to src/main/scala/net/psforever/services/galaxy/GalaxyServiceResponse.scala index a22abe26..8bdb55e4 100644 --- a/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala +++ b/src/main/scala/net/psforever/services/galaxy/GalaxyServiceResponse.scala @@ -1,12 +1,12 @@ // Copyright (c) 2017 PSForever -package services.galaxy +package net.psforever.services.galaxy import net.psforever.objects.Vehicle import net.psforever.objects.vehicles.VehicleManifest import net.psforever.objects.zones.HotSpotInfo import net.psforever.packet.game.BuildingInfoUpdateMessage import net.psforever.types.PlanetSideGUID -import services.GenericEventBusMsg +import net.psforever.services.GenericEventBusMsg final case class GalaxyServiceResponse(channel: String, replyMessage: GalaxyResponse.Response) extends GenericEventBusMsg diff --git a/common/src/main/scala/services/local/LocalService.scala b/src/main/scala/net/psforever/services/local/LocalService.scala similarity index 98% rename from common/src/main/scala/services/local/LocalService.scala rename to src/main/scala/net/psforever/services/local/LocalService.scala index af4d8599..fa4e43a7 100644 --- a/common/src/main/scala/services/local/LocalService.scala +++ b/src/main/scala/net/psforever/services/local/LocalService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.local +package net.psforever.services.local import akka.actor.{Actor, ActorRef, Props} import net.psforever.actors.zone.{BuildingActor, ZoneActor} @@ -11,14 +11,14 @@ import net.psforever.objects._ import net.psforever.packet.game.{TriggeredEffect, TriggeredEffectLocation} import net.psforever.objects.vital.Vitality import net.psforever.types.{PlanetSideGUID, Vector3} -import services.local.support._ -import services.vehicle.{VehicleAction, VehicleServiceMessage} -import services.{GenericEventBus, RemoverActor, Service} +import net.psforever.services.local.support._ +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.{GenericEventBus, RemoverActor, Service} import scala.concurrent.duration._ import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.vehicles.{Utility, UtilityType} -import services.support.SupportActor +import net.psforever.services.support.SupportActor import scala.concurrent.duration.Duration diff --git a/common/src/main/scala/services/local/LocalServiceMessage.scala b/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala similarity index 99% rename from common/src/main/scala/services/local/LocalServiceMessage.scala rename to src/main/scala/net/psforever/services/local/LocalServiceMessage.scala index c78d51fd..19685f2f 100644 --- a/common/src/main/scala/services/local/LocalServiceMessage.scala +++ b/src/main/scala/net/psforever/services/local/LocalServiceMessage.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.local +package net.psforever.services.local import net.psforever.objects.{PlanetSideGameObject, TelepadDeployable, Vehicle} import net.psforever.objects.ce.Deployable diff --git a/common/src/main/scala/services/local/LocalServiceResponse.scala b/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala similarity index 97% rename from common/src/main/scala/services/local/LocalServiceResponse.scala rename to src/main/scala/net/psforever/services/local/LocalServiceResponse.scala index 54e6f64b..9b7f959d 100644 --- a/common/src/main/scala/services/local/LocalServiceResponse.scala +++ b/src/main/scala/net/psforever/services/local/LocalServiceResponse.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.local +package net.psforever.services.local import net.psforever.objects.{PlanetSideGameObject, TelepadDeployable, Vehicle} import net.psforever.objects.ce.Deployable @@ -7,7 +7,7 @@ import net.psforever.objects.serverobject.terminals.{ProximityUnit, Terminal} import net.psforever.objects.vehicles.Utility import net.psforever.packet.game._ import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} -import services.GenericEventBusMsg +import net.psforever.services.GenericEventBusMsg final case class LocalServiceResponse( channel: String, diff --git a/common/src/main/scala/services/local/support/DeployableRemover.scala b/src/main/scala/net/psforever/services/local/support/DeployableRemover.scala similarity index 97% rename from common/src/main/scala/services/local/support/DeployableRemover.scala rename to src/main/scala/net/psforever/services/local/support/DeployableRemover.scala index 8339393f..c730f449 100644 --- a/common/src/main/scala/services/local/support/DeployableRemover.scala +++ b/src/main/scala/net/psforever/services/local/support/DeployableRemover.scala @@ -1,12 +1,12 @@ // Copyright (c) 2017 PSForever -package services.local.support +package net.psforever.services.local.support import net.psforever.objects.ce.Deployable import net.psforever.objects.guid.{GUIDTask, TaskResolver} import net.psforever.objects.zones.Zone import net.psforever.objects.{BoomerDeployable, PlanetSideGameObject, TurretDeployable} import net.psforever.types.{PlanetSideGUID, Vector3} -import services.RemoverActor +import net.psforever.services.RemoverActor import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/local/support/DoorCloseActor.scala b/src/main/scala/net/psforever/services/local/support/DoorCloseActor.scala similarity index 99% rename from common/src/main/scala/services/local/support/DoorCloseActor.scala rename to src/main/scala/net/psforever/services/local/support/DoorCloseActor.scala index 146718b4..e6557011 100644 --- a/common/src/main/scala/services/local/support/DoorCloseActor.scala +++ b/src/main/scala/net/psforever/services/local/support/DoorCloseActor.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.local.support +package net.psforever.services.local.support import akka.actor.{Actor, Cancellable} import net.psforever.objects.{Default, Player} diff --git a/common/src/main/scala/services/local/support/HackCaptureActor.scala b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala similarity index 99% rename from common/src/main/scala/services/local/support/HackCaptureActor.scala rename to src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala index 6d881e4c..d605c6e5 100644 --- a/common/src/main/scala/services/local/support/HackCaptureActor.scala +++ b/src/main/scala/net/psforever/services/local/support/HackCaptureActor.scala @@ -1,4 +1,4 @@ -package services.local.support +package net.psforever.services.local.support import akka.actor.{Actor, Cancellable} import net.psforever.actors.zone.ZoneActor diff --git a/common/src/main/scala/services/local/support/HackClearActor.scala b/src/main/scala/net/psforever/services/local/support/HackClearActor.scala similarity index 99% rename from common/src/main/scala/services/local/support/HackClearActor.scala rename to src/main/scala/net/psforever/services/local/support/HackClearActor.scala index 0dd13238..28748caa 100644 --- a/common/src/main/scala/services/local/support/HackClearActor.scala +++ b/src/main/scala/net/psforever/services/local/support/HackClearActor.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.local.support +package net.psforever.services.local.support import java.util.concurrent.TimeUnit diff --git a/common/src/main/scala/services/local/support/RouterTelepadActivation.scala b/src/main/scala/net/psforever/services/local/support/RouterTelepadActivation.scala similarity index 97% rename from common/src/main/scala/services/local/support/RouterTelepadActivation.scala rename to src/main/scala/net/psforever/services/local/support/RouterTelepadActivation.scala index 3ee8a60c..decf9407 100644 --- a/common/src/main/scala/services/local/support/RouterTelepadActivation.scala +++ b/src/main/scala/net/psforever/services/local/support/RouterTelepadActivation.scala @@ -1,10 +1,10 @@ // Copyright (c) 2017 PSForever -package services.local.support +package net.psforever.services.local.support import akka.actor.Cancellable import net.psforever.objects.zones.Zone import net.psforever.objects._ -import services.support.{SimilarityComparator, SupportActor} +import net.psforever.services.support.{SimilarityComparator, SupportActor} import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/properties/PropertyOverrideManager.scala b/src/main/scala/net/psforever/services/properties/PropertyOverrideManager.scala similarity index 98% rename from common/src/main/scala/services/properties/PropertyOverrideManager.scala rename to src/main/scala/net/psforever/services/properties/PropertyOverrideManager.scala index 3bea7c1c..f296341c 100644 --- a/common/src/main/scala/services/properties/PropertyOverrideManager.scala +++ b/src/main/scala/net/psforever/services/properties/PropertyOverrideManager.scala @@ -1,4 +1,4 @@ -package services.properties +package net.psforever.services.properties import akka.actor.Actor import net.psforever.packet.game.{GamePropertyTarget, PropertyOverrideMessage} diff --git a/common/src/main/scala/services/support/SimilarityComparator.scala b/src/main/scala/net/psforever/services/support/SimilarityComparator.scala similarity index 87% rename from common/src/main/scala/services/support/SimilarityComparator.scala rename to src/main/scala/net/psforever/services/support/SimilarityComparator.scala index c1b07f44..d9ea16a1 100644 --- a/common/src/main/scala/services/support/SimilarityComparator.scala +++ b/src/main/scala/net/psforever/services/support/SimilarityComparator.scala @@ -1,10 +1,11 @@ // Copyright (c) 2017 PSForever -package services.support +package net.psforever.services.support abstract class SimilarityComparator[A <: SupportActor.Entry] { /** * Match two entries by object and by zone information. + * * @param entry1 the first entry * @param entry2 the second entry * @return if they match diff --git a/common/src/main/scala/services/support/SupportActor.scala b/src/main/scala/net/psforever/services/support/SupportActor.scala similarity index 98% rename from common/src/main/scala/services/support/SupportActor.scala rename to src/main/scala/net/psforever/services/support/SupportActor.scala index ef1426a9..dd3076e4 100644 --- a/common/src/main/scala/services/support/SupportActor.scala +++ b/src/main/scala/net/psforever/services/support/SupportActor.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.support +package net.psforever.services.support import akka.actor.Actor import net.psforever.objects.PlanetSideGameObject @@ -8,7 +8,8 @@ import net.psforever.objects.zones.Zone import scala.annotation.tailrec abstract class SupportActor[A <: SupportActor.Entry] extends Actor { - private[this] val log = org.log4s.getLogger + private[this] val log = org.log4s.getLogger + def info(msg: String): Unit = log.info(msg) def trace(msg: String): Unit = log.trace(msg) def debug(msg: String): Unit = log.debug(msg) diff --git a/common/src/main/scala/services/support/SupportActorCaseConversions.scala b/src/main/scala/net/psforever/services/support/SupportActorCaseConversions.scala similarity index 92% rename from common/src/main/scala/services/support/SupportActorCaseConversions.scala rename to src/main/scala/net/psforever/services/support/SupportActorCaseConversions.scala index 6a714288..4a1fedd7 100644 --- a/common/src/main/scala/services/support/SupportActorCaseConversions.scala +++ b/src/main/scala/net/psforever/services/support/SupportActorCaseConversions.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.support +package net.psforever.services.support import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.zones.Zone @@ -8,8 +8,9 @@ trait SupportActorCaseConversions { /** * A mask for converting between a class local and `SupportActor.HurrySpecific`. + * * @param targets a list of objects to match - * @param zone the zone in which these objects exist + * @param zone the zone in which these objects exist * @return a `SupportActor.HurrySpecific` object */ def HurrySpecific(targets: List[PlanetSideGameObject], zone: Zone): SupportActor.HurrySpecific = diff --git a/common/src/main/scala/services/teamwork/SquadService.scala b/src/main/scala/net/psforever/services/teamwork/SquadService.scala similarity index 99% rename from common/src/main/scala/services/teamwork/SquadService.scala rename to src/main/scala/net/psforever/services/teamwork/SquadService.scala index 3967d807..d59bcf49 100644 --- a/common/src/main/scala/services/teamwork/SquadService.scala +++ b/src/main/scala/net/psforever/services/teamwork/SquadService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2019 PSForever -package services.teamwork +package net.psforever.services.teamwork import akka.actor.{Actor, ActorRef, Terminated} import net.psforever.objects.avatar.Avatar @@ -18,7 +18,7 @@ import net.psforever.packet.game.{ WaypointInfo } import net.psforever.types._ -import services.{GenericEventBus, Service} +import net.psforever.services.{GenericEventBus, Service} import scala.collection.concurrent.TrieMap import scala.collection.mutable diff --git a/common/src/main/scala/services/teamwork/SquadServiceMessage.scala b/src/main/scala/net/psforever/services/teamwork/SquadServiceMessage.scala similarity index 96% rename from common/src/main/scala/services/teamwork/SquadServiceMessage.scala rename to src/main/scala/net/psforever/services/teamwork/SquadServiceMessage.scala index 157a434a..adbd12f5 100644 --- a/common/src/main/scala/services/teamwork/SquadServiceMessage.scala +++ b/src/main/scala/net/psforever/services/teamwork/SquadServiceMessage.scala @@ -1,5 +1,5 @@ // Copyright (c) 2019 PSForever -package services.teamwork +package net.psforever.services.teamwork import net.psforever.objects.Player import net.psforever.objects.zones.Zone @@ -9,6 +9,7 @@ import net.psforever.types.{PlanetSideGUID, SquadRequestType, SquadWaypoints, Ve final case class SquadServiceMessage(tplayer: Player, zone: Zone, actionMessage: Any) object SquadServiceMessage { + final case class RecoverSquadMembership() } diff --git a/common/src/main/scala/services/teamwork/SquadServiceResponse.scala b/src/main/scala/net/psforever/services/teamwork/SquadServiceResponse.scala similarity index 96% rename from common/src/main/scala/services/teamwork/SquadServiceResponse.scala rename to src/main/scala/net/psforever/services/teamwork/SquadServiceResponse.scala index 00325b63..fd6598fc 100644 --- a/common/src/main/scala/services/teamwork/SquadServiceResponse.scala +++ b/src/main/scala/net/psforever/services/teamwork/SquadServiceResponse.scala @@ -1,10 +1,10 @@ // Copyright (c) 2019 PSForever -package services.teamwork +package net.psforever.services.teamwork import net.psforever.objects.teamwork.Squad import net.psforever.packet.game.{SquadDetail, SquadInfo, WaypointEventAction, WaypointInfo} import net.psforever.types.{PlanetSideGUID, SquadResponseType, SquadWaypoints} -import services.GenericEventBusMsg +import net.psforever.services.GenericEventBusMsg final case class SquadServiceResponse(channel: String, exclude: Iterable[Long], response: SquadResponse.Response) extends GenericEventBusMsg diff --git a/common/src/main/scala/services/teamwork/SquadSwitchboard.scala b/src/main/scala/net/psforever/services/teamwork/SquadSwitchboard.scala similarity index 99% rename from common/src/main/scala/services/teamwork/SquadSwitchboard.scala rename to src/main/scala/net/psforever/services/teamwork/SquadSwitchboard.scala index bea2ca74..339e06dd 100644 --- a/common/src/main/scala/services/teamwork/SquadSwitchboard.scala +++ b/src/main/scala/net/psforever/services/teamwork/SquadSwitchboard.scala @@ -1,5 +1,5 @@ // Copyright (c) 2019 PSForever -package services.teamwork +package net.psforever.services.teamwork import akka.actor.{Actor, ActorRef, Terminated} diff --git a/common/src/main/scala/services/vehicle/VehicleService.scala b/src/main/scala/net/psforever/services/vehicle/VehicleService.scala similarity index 98% rename from common/src/main/scala/services/vehicle/VehicleService.scala rename to src/main/scala/net/psforever/services/vehicle/VehicleService.scala index f729d752..a077f15a 100644 --- a/common/src/main/scala/services/vehicle/VehicleService.scala +++ b/src/main/scala/net/psforever/services/vehicle/VehicleService.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.vehicle +package net.psforever.services.vehicle import akka.actor.{Actor, ActorRef, Props} import net.psforever.objects.Vehicle @@ -10,9 +10,9 @@ import net.psforever.objects.vital.RepairFromTerm import net.psforever.objects.zones.Zone import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent -import services.vehicle.support.{TurretUpgrader, VehicleRemover} +import net.psforever.services.vehicle.support.{TurretUpgrader, VehicleRemover} import net.psforever.types.{DriveState, PlanetSideGUID} -import services.{GenericEventBus, RemoverActor, Service} +import net.psforever.services.{GenericEventBus, RemoverActor, Service} class VehicleService(zone: Zone) extends Actor { private val vehicleDecon: ActorRef = context.actorOf(Props[VehicleRemover](), s"${zone.id}-vehicle-decon-agent") diff --git a/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala b/src/main/scala/net/psforever/services/vehicle/VehicleServiceMessage.scala similarity index 99% rename from common/src/main/scala/services/vehicle/VehicleServiceMessage.scala rename to src/main/scala/net/psforever/services/vehicle/VehicleServiceMessage.scala index 53222913..c1acb429 100644 --- a/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala +++ b/src/main/scala/net/psforever/services/vehicle/VehicleServiceMessage.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.vehicle +package net.psforever.services.vehicle import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.equipment.Equipment diff --git a/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala b/src/main/scala/net/psforever/services/vehicle/VehicleServiceResponse.scala similarity index 98% rename from common/src/main/scala/services/vehicle/VehicleServiceResponse.scala rename to src/main/scala/net/psforever/services/vehicle/VehicleServiceResponse.scala index 258b413e..aa9c2ed3 100644 --- a/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala +++ b/src/main/scala/net/psforever/services/vehicle/VehicleServiceResponse.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.vehicle +package net.psforever.services.vehicle import net.psforever.objects.equipment.Equipment import net.psforever.objects.inventory.InventoryItem @@ -11,7 +11,7 @@ import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.ConstructorData import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types.{BailType, DriveState, PlanetSideGUID, Vector3} -import services.GenericEventBusMsg +import net.psforever.services.GenericEventBusMsg final case class VehicleServiceResponse( channel: String, diff --git a/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala b/src/main/scala/net/psforever/services/vehicle/support/TurretUpgrader.scala similarity index 97% rename from common/src/main/scala/services/vehicle/support/TurretUpgrader.scala rename to src/main/scala/net/psforever/services/vehicle/support/TurretUpgrader.scala index 6bc0c9fe..3857e20d 100644 --- a/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala +++ b/src/main/scala/net/psforever/services/vehicle/support/TurretUpgrader.scala @@ -1,5 +1,5 @@ // Copyright (c) 2017 PSForever -package services.vehicle.support +package net.psforever.services.vehicle.support import akka.actor.{ActorRef, Cancellable} import net.psforever.objects.{AmmoBox, Default, PlanetSideGameObject, Tool} @@ -9,9 +9,9 @@ import net.psforever.objects.serverobject.turret.{FacilityTurret, TurretUpgrade, import net.psforever.objects.vehicles.MountedWeapons import net.psforever.objects.zones.Zone import net.psforever.types.PlanetSideGUID -import services.support.{SimilarityComparator, SupportActor, SupportActorCaseConversions} -import services.vehicle.{VehicleAction, VehicleServiceMessage} -import services.{Service, ServiceManager} +import net.psforever.services.support.{SimilarityComparator, SupportActor, SupportActorCaseConversions} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.{Service, ServiceManager} import scala.concurrent.duration._ import scala.util.Success diff --git a/common/src/main/scala/services/vehicle/support/VehicleRemover.scala b/src/main/scala/net/psforever/services/vehicle/support/VehicleRemover.scala similarity index 88% rename from common/src/main/scala/services/vehicle/support/VehicleRemover.scala rename to src/main/scala/net/psforever/services/vehicle/support/VehicleRemover.scala index 26800601..8758f9ae 100644 --- a/common/src/main/scala/services/vehicle/support/VehicleRemover.scala +++ b/src/main/scala/net/psforever/services/vehicle/support/VehicleRemover.scala @@ -1,10 +1,10 @@ // Copyright (c) 2017-2020 PSForever -package services.vehicle.support +package net.psforever.services.vehicle.support import akka.actor.{Actor, ActorRef} import net.psforever.objects.Vehicle import net.psforever.objects.guid.GUIDTask.UnregisterVehicle -import services.{RemoverActor, ServiceManager} +import net.psforever.services.{RemoverActor, ServiceManager} class VehicleRemover extends Actor { var taskResolver: ActorRef = ActorRef.noSender diff --git a/common/src/main/scala/net/psforever/types/Angular.scala b/src/main/scala/net/psforever/types/Angular.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/Angular.scala rename to src/main/scala/net/psforever/types/Angular.scala diff --git a/common/src/main/scala/net/psforever/types/BailType.scala b/src/main/scala/net/psforever/types/BailType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/BailType.scala rename to src/main/scala/net/psforever/types/BailType.scala diff --git a/common/src/main/scala/net/psforever/types/CapacitorStateType.scala b/src/main/scala/net/psforever/types/CapacitorStateType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/CapacitorStateType.scala rename to src/main/scala/net/psforever/types/CapacitorStateType.scala diff --git a/common/src/main/scala/net/psforever/types/CargoStatus.scala b/src/main/scala/net/psforever/types/CargoStatus.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/CargoStatus.scala rename to src/main/scala/net/psforever/types/CargoStatus.scala diff --git a/common/src/main/scala/net/psforever/types/CharacterGender.scala b/src/main/scala/net/psforever/types/CharacterGender.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/CharacterGender.scala rename to src/main/scala/net/psforever/types/CharacterGender.scala diff --git a/common/src/main/scala/net/psforever/types/CharacterVoice.scala b/src/main/scala/net/psforever/types/CharacterVoice.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/CharacterVoice.scala rename to src/main/scala/net/psforever/types/CharacterVoice.scala diff --git a/common/src/main/scala/net/psforever/types/ChatMessageType.scala b/src/main/scala/net/psforever/types/ChatMessageType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/ChatMessageType.scala rename to src/main/scala/net/psforever/types/ChatMessageType.scala diff --git a/common/src/main/scala/net/psforever/types/DriveState.scala b/src/main/scala/net/psforever/types/DriveState.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/DriveState.scala rename to src/main/scala/net/psforever/types/DriveState.scala diff --git a/common/src/main/scala/net/psforever/types/EmoteType.scala b/src/main/scala/net/psforever/types/EmoteType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/EmoteType.scala rename to src/main/scala/net/psforever/types/EmoteType.scala diff --git a/common/src/main/scala/net/psforever/types/ExoSuitType.scala b/src/main/scala/net/psforever/types/ExoSuitType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/ExoSuitType.scala rename to src/main/scala/net/psforever/types/ExoSuitType.scala diff --git a/common/src/main/scala/net/psforever/types/GrenadeState.scala b/src/main/scala/net/psforever/types/GrenadeState.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/GrenadeState.scala rename to src/main/scala/net/psforever/types/GrenadeState.scala diff --git a/common/src/main/scala/net/psforever/types/ImplantType.scala b/src/main/scala/net/psforever/types/ImplantType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/ImplantType.scala rename to src/main/scala/net/psforever/types/ImplantType.scala diff --git a/common/src/main/scala/net/psforever/types/LoadoutType.scala b/src/main/scala/net/psforever/types/LoadoutType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/LoadoutType.scala rename to src/main/scala/net/psforever/types/LoadoutType.scala diff --git a/common/src/main/scala/net/psforever/types/MeritCommendation.scala b/src/main/scala/net/psforever/types/MeritCommendation.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/MeritCommendation.scala rename to src/main/scala/net/psforever/types/MeritCommendation.scala diff --git a/common/src/main/scala/net/psforever/types/PlanetSideEmpire.scala b/src/main/scala/net/psforever/types/PlanetSideEmpire.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/PlanetSideEmpire.scala rename to src/main/scala/net/psforever/types/PlanetSideEmpire.scala diff --git a/common/src/main/scala/net/psforever/types/PlanetSideGUID.scala b/src/main/scala/net/psforever/types/PlanetSideGUID.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/PlanetSideGUID.scala rename to src/main/scala/net/psforever/types/PlanetSideGUID.scala diff --git a/common/src/main/scala/net/psforever/types/PlanetSideGeneratorState.scala b/src/main/scala/net/psforever/types/PlanetSideGeneratorState.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/PlanetSideGeneratorState.scala rename to src/main/scala/net/psforever/types/PlanetSideGeneratorState.scala diff --git a/common/src/main/scala/net/psforever/types/SpawnGroup.scala b/src/main/scala/net/psforever/types/SpawnGroup.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/SpawnGroup.scala rename to src/main/scala/net/psforever/types/SpawnGroup.scala diff --git a/common/src/main/scala/net/psforever/types/SquadRequestType.scala b/src/main/scala/net/psforever/types/SquadRequestType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/SquadRequestType.scala rename to src/main/scala/net/psforever/types/SquadRequestType.scala diff --git a/common/src/main/scala/net/psforever/types/SquadResponseType.scala b/src/main/scala/net/psforever/types/SquadResponseType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/SquadResponseType.scala rename to src/main/scala/net/psforever/types/SquadResponseType.scala diff --git a/common/src/main/scala/net/psforever/types/SquadWaypoints.scala b/src/main/scala/net/psforever/types/SquadWaypoints.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/SquadWaypoints.scala rename to src/main/scala/net/psforever/types/SquadWaypoints.scala diff --git a/common/src/main/scala/net/psforever/types/TransactionType.scala b/src/main/scala/net/psforever/types/TransactionType.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/TransactionType.scala rename to src/main/scala/net/psforever/types/TransactionType.scala diff --git a/common/src/main/scala/net/psforever/types/Vector3.scala b/src/main/scala/net/psforever/types/Vector3.scala similarity index 100% rename from common/src/main/scala/net/psforever/types/Vector3.scala rename to src/main/scala/net/psforever/types/Vector3.scala diff --git a/common/src/main/scala/net/psforever/util/Config.scala b/src/main/scala/net/psforever/util/Config.scala similarity index 100% rename from common/src/main/scala/net/psforever/util/Config.scala rename to src/main/scala/net/psforever/util/Config.scala diff --git a/common/src/main/scala/net/psforever/util/Database.scala b/src/main/scala/net/psforever/util/Database.scala similarity index 100% rename from common/src/main/scala/net/psforever/util/Database.scala rename to src/main/scala/net/psforever/util/Database.scala diff --git a/common/src/main/scala/net/psforever/util/DefinitionUtil.scala b/src/main/scala/net/psforever/util/DefinitionUtil.scala similarity index 100% rename from common/src/main/scala/net/psforever/util/DefinitionUtil.scala rename to src/main/scala/net/psforever/util/DefinitionUtil.scala diff --git a/common/src/main/scala/net/psforever/util/PointOfInterest.scala b/src/main/scala/net/psforever/util/PointOfInterest.scala similarity index 100% rename from common/src/main/scala/net/psforever/util/PointOfInterest.scala rename to src/main/scala/net/psforever/util/PointOfInterest.scala diff --git a/common/src/main/scala/net/psforever/zones/Zones.scala b/src/main/scala/net/psforever/zones/Zones.scala similarity index 100% rename from common/src/main/scala/net/psforever/zones/Zones.scala rename to src/main/scala/net/psforever/zones/Zones.scala diff --git a/common/src/main/scala/scodec/interop/akka/package.scala b/src/main/scala/scodec/interop/akka/package.scala similarity index 100% rename from common/src/main/scala/scodec/interop/akka/package.scala rename to src/main/scala/scodec/interop/akka/package.scala diff --git a/common/src/main/scala/sna/Library.scala b/src/main/scala/sna/Library.scala similarity index 100% rename from common/src/main/scala/sna/Library.scala rename to src/main/scala/sna/Library.scala diff --git a/pslogin/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml similarity index 100% rename from pslogin/src/test/resources/logback-test.xml rename to src/test/resources/logback-test.xml diff --git a/common/src/test/scala/CodecTest.scala b/src/test/scala/CodecTest.scala similarity index 100% rename from common/src/test/scala/CodecTest.scala rename to src/test/scala/CodecTest.scala diff --git a/common/src/test/scala/CryptoInterfaceTest.scala b/src/test/scala/CryptoInterfaceTest.scala similarity index 100% rename from common/src/test/scala/CryptoInterfaceTest.scala rename to src/test/scala/CryptoInterfaceTest.scala diff --git a/common/src/test/scala/CryptoPacketTest.scala b/src/test/scala/CryptoPacketTest.scala similarity index 100% rename from common/src/test/scala/CryptoPacketTest.scala rename to src/test/scala/CryptoPacketTest.scala diff --git a/common/src/test/scala/PacketCodingTest.scala b/src/test/scala/PacketCodingTest.scala similarity index 100% rename from common/src/test/scala/PacketCodingTest.scala rename to src/test/scala/PacketCodingTest.scala diff --git a/common/src/test/scala/Vector3Test.scala b/src/test/scala/Vector3Test.scala similarity index 100% rename from common/src/test/scala/Vector3Test.scala rename to src/test/scala/Vector3Test.scala diff --git a/common/src/test/scala/base/ActorTest.scala b/src/test/scala/base/ActorTest.scala similarity index 100% rename from common/src/test/scala/base/ActorTest.scala rename to src/test/scala/base/ActorTest.scala diff --git a/common/src/test/scala/base/FreedContextActorTest.scala b/src/test/scala/base/FreedContextActorTest.scala similarity index 100% rename from common/src/test/scala/base/FreedContextActorTest.scala rename to src/test/scala/base/FreedContextActorTest.scala diff --git a/common/src/test/scala/control/ClientStartTest.scala b/src/test/scala/control/ClientStartTest.scala similarity index 100% rename from common/src/test/scala/control/ClientStartTest.scala rename to src/test/scala/control/ClientStartTest.scala diff --git a/common/src/test/scala/control/ConnectionCloseTest.scala b/src/test/scala/control/ConnectionCloseTest.scala similarity index 100% rename from common/src/test/scala/control/ConnectionCloseTest.scala rename to src/test/scala/control/ConnectionCloseTest.scala diff --git a/common/src/test/scala/control/ControlSyncRespTest.scala b/src/test/scala/control/ControlSyncRespTest.scala similarity index 100% rename from common/src/test/scala/control/ControlSyncRespTest.scala rename to src/test/scala/control/ControlSyncRespTest.scala diff --git a/common/src/test/scala/control/ControlSyncTest.scala b/src/test/scala/control/ControlSyncTest.scala similarity index 100% rename from common/src/test/scala/control/ControlSyncTest.scala rename to src/test/scala/control/ControlSyncTest.scala diff --git a/common/src/test/scala/control/HandleGamePacketTest.scala b/src/test/scala/control/HandleGamePacketTest.scala similarity index 100% rename from common/src/test/scala/control/HandleGamePacketTest.scala rename to src/test/scala/control/HandleGamePacketTest.scala diff --git a/common/src/test/scala/control/MultiPacketCollectorTest.scala b/src/test/scala/control/MultiPacketCollectorTest.scala similarity index 100% rename from common/src/test/scala/control/MultiPacketCollectorTest.scala rename to src/test/scala/control/MultiPacketCollectorTest.scala diff --git a/common/src/test/scala/control/MultiPacketExTest.scala b/src/test/scala/control/MultiPacketExTest.scala similarity index 100% rename from common/src/test/scala/control/MultiPacketExTest.scala rename to src/test/scala/control/MultiPacketExTest.scala diff --git a/common/src/test/scala/control/MultiPacketTest.scala b/src/test/scala/control/MultiPacketTest.scala similarity index 100% rename from common/src/test/scala/control/MultiPacketTest.scala rename to src/test/scala/control/MultiPacketTest.scala diff --git a/common/src/test/scala/control/RelatedATest.scala b/src/test/scala/control/RelatedATest.scala similarity index 100% rename from common/src/test/scala/control/RelatedATest.scala rename to src/test/scala/control/RelatedATest.scala diff --git a/common/src/test/scala/control/RelatedBTest.scala b/src/test/scala/control/RelatedBTest.scala similarity index 100% rename from common/src/test/scala/control/RelatedBTest.scala rename to src/test/scala/control/RelatedBTest.scala diff --git a/common/src/test/scala/control/SlottedMetaPacketTest.scala b/src/test/scala/control/SlottedMetaPacketTest.scala similarity index 100% rename from common/src/test/scala/control/SlottedMetaPacketTest.scala rename to src/test/scala/control/SlottedMetaPacketTest.scala diff --git a/common/src/test/scala/control/TeardownConnectionTest.scala b/src/test/scala/control/TeardownConnectionTest.scala similarity index 100% rename from common/src/test/scala/control/TeardownConnectionTest.scala rename to src/test/scala/control/TeardownConnectionTest.scala diff --git a/common/src/test/scala/game/ActionCancelMessageTest.scala b/src/test/scala/game/ActionCancelMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ActionCancelMessageTest.scala rename to src/test/scala/game/ActionCancelMessageTest.scala diff --git a/common/src/test/scala/game/ActionProgressMessageTest.scala b/src/test/scala/game/ActionProgressMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ActionProgressMessageTest.scala rename to src/test/scala/game/ActionProgressMessageTest.scala diff --git a/common/src/test/scala/game/ActionResultMessageTest.scala b/src/test/scala/game/ActionResultMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ActionResultMessageTest.scala rename to src/test/scala/game/ActionResultMessageTest.scala diff --git a/common/src/test/scala/game/ArmorChangedMessageTest.scala b/src/test/scala/game/ArmorChangedMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ArmorChangedMessageTest.scala rename to src/test/scala/game/ArmorChangedMessageTest.scala diff --git a/common/src/test/scala/game/AvatarDeadStateMessageTest.scala b/src/test/scala/game/AvatarDeadStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarDeadStateMessageTest.scala rename to src/test/scala/game/AvatarDeadStateMessageTest.scala diff --git a/common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala b/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala rename to src/test/scala/game/AvatarFirstTimeEventMessageTest.scala diff --git a/common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala b/src/test/scala/game/AvatarGrenadeStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala rename to src/test/scala/game/AvatarGrenadeStateMessageTest.scala diff --git a/common/src/test/scala/game/AvatarImplantMessageTest.scala b/src/test/scala/game/AvatarImplantMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarImplantMessageTest.scala rename to src/test/scala/game/AvatarImplantMessageTest.scala diff --git a/common/src/test/scala/game/AvatarJumpMessageTest.scala b/src/test/scala/game/AvatarJumpMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarJumpMessageTest.scala rename to src/test/scala/game/AvatarJumpMessageTest.scala diff --git a/common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala b/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala rename to src/test/scala/game/AvatarSearchCriteriaMessageTest.scala diff --git a/common/src/test/scala/game/AvatarStatisticsMessageTest.scala b/src/test/scala/game/AvatarStatisticsMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarStatisticsMessageTest.scala rename to src/test/scala/game/AvatarStatisticsMessageTest.scala diff --git a/common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala b/src/test/scala/game/AvatarVehicleTimerMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala rename to src/test/scala/game/AvatarVehicleTimerMessageTest.scala diff --git a/common/src/test/scala/game/BattleExperienceMessageTest.scala b/src/test/scala/game/BattleExperienceMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BattleExperienceMessageTest.scala rename to src/test/scala/game/BattleExperienceMessageTest.scala diff --git a/common/src/test/scala/game/BattleplanMessageTest.scala b/src/test/scala/game/BattleplanMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BattleplanMessageTest.scala rename to src/test/scala/game/BattleplanMessageTest.scala diff --git a/common/src/test/scala/game/BeginZoningMessageTest.scala b/src/test/scala/game/BeginZoningMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BeginZoningMessageTest.scala rename to src/test/scala/game/BeginZoningMessageTest.scala diff --git a/common/src/test/scala/game/BindPlayerMessageTest.scala b/src/test/scala/game/BindPlayerMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BindPlayerMessageTest.scala rename to src/test/scala/game/BindPlayerMessageTest.scala diff --git a/common/src/test/scala/game/BroadcastWarpgateUpdateMessageTest.scala b/src/test/scala/game/BroadcastWarpgateUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BroadcastWarpgateUpdateMessageTest.scala rename to src/test/scala/game/BroadcastWarpgateUpdateMessageTest.scala diff --git a/common/src/test/scala/game/BugReportMessageTest.scala b/src/test/scala/game/BugReportMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BugReportMessageTest.scala rename to src/test/scala/game/BugReportMessageTest.scala diff --git a/common/src/test/scala/game/BuildingInfoUpdateMessageTest.scala b/src/test/scala/game/BuildingInfoUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/BuildingInfoUpdateMessageTest.scala rename to src/test/scala/game/BuildingInfoUpdateMessageTest.scala diff --git a/common/src/test/scala/game/ChainLashMessageTest.scala b/src/test/scala/game/ChainLashMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ChainLashMessageTest.scala rename to src/test/scala/game/ChainLashMessageTest.scala diff --git a/common/src/test/scala/game/ChangeAmmoMessageTest.scala b/src/test/scala/game/ChangeAmmoMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ChangeAmmoMessageTest.scala rename to src/test/scala/game/ChangeAmmoMessageTest.scala diff --git a/common/src/test/scala/game/ChangeFireModeMessageTest.scala b/src/test/scala/game/ChangeFireModeMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ChangeFireModeMessageTest.scala rename to src/test/scala/game/ChangeFireModeMessageTest.scala diff --git a/common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala b/src/test/scala/game/ChangeFireStateMessage_StartTest.scala similarity index 100% rename from common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala rename to src/test/scala/game/ChangeFireStateMessage_StartTest.scala diff --git a/common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala b/src/test/scala/game/ChangeFireStateMessage_StopTest.scala similarity index 100% rename from common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala rename to src/test/scala/game/ChangeFireStateMessage_StopTest.scala diff --git a/common/src/test/scala/game/ChangeShortcutBankMessageTest.scala b/src/test/scala/game/ChangeShortcutBankMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ChangeShortcutBankMessageTest.scala rename to src/test/scala/game/ChangeShortcutBankMessageTest.scala diff --git a/common/src/test/scala/game/CharacterCreateRequestMessageTest.scala b/src/test/scala/game/CharacterCreateRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CharacterCreateRequestMessageTest.scala rename to src/test/scala/game/CharacterCreateRequestMessageTest.scala diff --git a/common/src/test/scala/game/CharacterInfoMessageTest.scala b/src/test/scala/game/CharacterInfoMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CharacterInfoMessageTest.scala rename to src/test/scala/game/CharacterInfoMessageTest.scala diff --git a/common/src/test/scala/game/CharacterKnowledgeMessageTest.scala b/src/test/scala/game/CharacterKnowledgeMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CharacterKnowledgeMessageTest.scala rename to src/test/scala/game/CharacterKnowledgeMessageTest.scala diff --git a/common/src/test/scala/game/CharacterNoRecordMessageTest.scala b/src/test/scala/game/CharacterNoRecordMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CharacterNoRecordMessageTest.scala rename to src/test/scala/game/CharacterNoRecordMessageTest.scala diff --git a/common/src/test/scala/game/CharacterRequestMessageTest.scala b/src/test/scala/game/CharacterRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CharacterRequestMessageTest.scala rename to src/test/scala/game/CharacterRequestMessageTest.scala diff --git a/common/src/test/scala/game/ChatMsgTest.scala b/src/test/scala/game/ChatMsgTest.scala similarity index 100% rename from common/src/test/scala/game/ChatMsgTest.scala rename to src/test/scala/game/ChatMsgTest.scala diff --git a/common/src/test/scala/game/ChildObjectStateMessageTest.scala b/src/test/scala/game/ChildObjectStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ChildObjectStateMessageTest.scala rename to src/test/scala/game/ChildObjectStateMessageTest.scala diff --git a/common/src/test/scala/game/ConnectToWorldMessageTest.scala b/src/test/scala/game/ConnectToWorldMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ConnectToWorldMessageTest.scala rename to src/test/scala/game/ConnectToWorldMessageTest.scala diff --git a/common/src/test/scala/game/ConnectToWorldRequestMessageTest.scala b/src/test/scala/game/ConnectToWorldRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ConnectToWorldRequestMessageTest.scala rename to src/test/scala/game/ConnectToWorldRequestMessageTest.scala diff --git a/common/src/test/scala/game/ContinentalLockUpdateMessageTest.scala b/src/test/scala/game/ContinentalLockUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ContinentalLockUpdateMessageTest.scala rename to src/test/scala/game/ContinentalLockUpdateMessageTest.scala diff --git a/common/src/test/scala/game/CreateShortcutMessageTest.scala b/src/test/scala/game/CreateShortcutMessageTest.scala similarity index 100% rename from common/src/test/scala/game/CreateShortcutMessageTest.scala rename to src/test/scala/game/CreateShortcutMessageTest.scala diff --git a/common/src/test/scala/game/DamageFeedbackMessageTest.scala b/src/test/scala/game/DamageFeedbackMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DamageFeedbackMessageTest.scala rename to src/test/scala/game/DamageFeedbackMessageTest.scala diff --git a/common/src/test/scala/game/DamageMessageTest.scala b/src/test/scala/game/DamageMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DamageMessageTest.scala rename to src/test/scala/game/DamageMessageTest.scala diff --git a/common/src/test/scala/game/DamageWithPositionMessageTest.scala b/src/test/scala/game/DamageWithPositionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DamageWithPositionMessageTest.scala rename to src/test/scala/game/DamageWithPositionMessageTest.scala diff --git a/common/src/test/scala/game/DataChallengeMessageRespTest.scala b/src/test/scala/game/DataChallengeMessageRespTest.scala similarity index 100% rename from common/src/test/scala/game/DataChallengeMessageRespTest.scala rename to src/test/scala/game/DataChallengeMessageRespTest.scala diff --git a/common/src/test/scala/game/DataChallengeMessageTest.scala b/src/test/scala/game/DataChallengeMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DataChallengeMessageTest.scala rename to src/test/scala/game/DataChallengeMessageTest.scala diff --git a/common/src/test/scala/game/DelayedPathMountMsgTest.scala b/src/test/scala/game/DelayedPathMountMsgTest.scala similarity index 100% rename from common/src/test/scala/game/DelayedPathMountMsgTest.scala rename to src/test/scala/game/DelayedPathMountMsgTest.scala diff --git a/common/src/test/scala/game/DensityLevelUpdateMessageTest.scala b/src/test/scala/game/DensityLevelUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DensityLevelUpdateMessageTest.scala rename to src/test/scala/game/DensityLevelUpdateMessageTest.scala diff --git a/common/src/test/scala/game/DeployObjectMessageTest.scala b/src/test/scala/game/DeployObjectMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DeployObjectMessageTest.scala rename to src/test/scala/game/DeployObjectMessageTest.scala diff --git a/common/src/test/scala/game/DeployRequestMessageTest.scala b/src/test/scala/game/DeployRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DeployRequestMessageTest.scala rename to src/test/scala/game/DeployRequestMessageTest.scala diff --git a/common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala b/src/test/scala/game/DeployableObjectsInfoMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala rename to src/test/scala/game/DeployableObjectsInfoMessageTest.scala diff --git a/common/src/test/scala/game/DestroyDisplayMessageTest.scala b/src/test/scala/game/DestroyDisplayMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DestroyDisplayMessageTest.scala rename to src/test/scala/game/DestroyDisplayMessageTest.scala diff --git a/common/src/test/scala/game/DestroyMessageTest.scala b/src/test/scala/game/DestroyMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DestroyMessageTest.scala rename to src/test/scala/game/DestroyMessageTest.scala diff --git a/common/src/test/scala/game/DisconnectMessageTest.scala b/src/test/scala/game/DisconnectMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DisconnectMessageTest.scala rename to src/test/scala/game/DisconnectMessageTest.scala diff --git a/common/src/test/scala/game/DismountBuildingMsgTest.scala b/src/test/scala/game/DismountBuildingMsgTest.scala similarity index 100% rename from common/src/test/scala/game/DismountBuildingMsgTest.scala rename to src/test/scala/game/DismountBuildingMsgTest.scala diff --git a/common/src/test/scala/game/DismountVehicleMsgTest.scala b/src/test/scala/game/DismountVehicleMsgTest.scala similarity index 100% rename from common/src/test/scala/game/DismountVehicleMsgTest.scala rename to src/test/scala/game/DismountVehicleMsgTest.scala diff --git a/common/src/test/scala/game/DisplayedAwardMessageTest.scala b/src/test/scala/game/DisplayedAwardMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DisplayedAwardMessageTest.scala rename to src/test/scala/game/DisplayedAwardMessageTest.scala diff --git a/common/src/test/scala/game/DropItemMessageTest.scala b/src/test/scala/game/DropItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DropItemMessageTest.scala rename to src/test/scala/game/DropItemMessageTest.scala diff --git a/common/src/test/scala/game/DroppodFreefallingMessageTest.scala b/src/test/scala/game/DroppodFreefallingMessageTest.scala similarity index 100% rename from common/src/test/scala/game/DroppodFreefallingMessageTest.scala rename to src/test/scala/game/DroppodFreefallingMessageTest.scala diff --git a/common/src/test/scala/game/EmoteMsgTest.scala b/src/test/scala/game/EmoteMsgTest.scala similarity index 100% rename from common/src/test/scala/game/EmoteMsgTest.scala rename to src/test/scala/game/EmoteMsgTest.scala diff --git a/common/src/test/scala/game/ExperienceAddedMessageTest.scala b/src/test/scala/game/ExperienceAddedMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ExperienceAddedMessageTest.scala rename to src/test/scala/game/ExperienceAddedMessageTest.scala diff --git a/common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala b/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala rename to src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala diff --git a/common/src/test/scala/game/FavoritesMessageTest.scala b/src/test/scala/game/FavoritesMessageTest.scala similarity index 100% rename from common/src/test/scala/game/FavoritesMessageTest.scala rename to src/test/scala/game/FavoritesMessageTest.scala diff --git a/common/src/test/scala/game/FavoritesRequestTest.scala b/src/test/scala/game/FavoritesRequestTest.scala similarity index 100% rename from common/src/test/scala/game/FavoritesRequestTest.scala rename to src/test/scala/game/FavoritesRequestTest.scala diff --git a/common/src/test/scala/game/FireHintMessageTest.scala b/src/test/scala/game/FireHintMessageTest.scala similarity index 100% rename from common/src/test/scala/game/FireHintMessageTest.scala rename to src/test/scala/game/FireHintMessageTest.scala diff --git a/common/src/test/scala/game/FriendsRequestTest.scala b/src/test/scala/game/FriendsRequestTest.scala similarity index 100% rename from common/src/test/scala/game/FriendsRequestTest.scala rename to src/test/scala/game/FriendsRequestTest.scala diff --git a/common/src/test/scala/game/FriendsResponseTest.scala b/src/test/scala/game/FriendsResponseTest.scala similarity index 100% rename from common/src/test/scala/game/FriendsResponseTest.scala rename to src/test/scala/game/FriendsResponseTest.scala diff --git a/common/src/test/scala/game/GenericActionMessageTest.scala b/src/test/scala/game/GenericActionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/GenericActionMessageTest.scala rename to src/test/scala/game/GenericActionMessageTest.scala diff --git a/common/src/test/scala/game/GenericCollisionMsgTest.scala b/src/test/scala/game/GenericCollisionMsgTest.scala similarity index 100% rename from common/src/test/scala/game/GenericCollisionMsgTest.scala rename to src/test/scala/game/GenericCollisionMsgTest.scala diff --git a/common/src/test/scala/game/GenericObjectActionMessageTest.scala b/src/test/scala/game/GenericObjectActionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/GenericObjectActionMessageTest.scala rename to src/test/scala/game/GenericObjectActionMessageTest.scala diff --git a/common/src/test/scala/game/GenericObjectStateMsgTest.scala b/src/test/scala/game/GenericObjectStateMsgTest.scala similarity index 100% rename from common/src/test/scala/game/GenericObjectStateMsgTest.scala rename to src/test/scala/game/GenericObjectStateMsgTest.scala diff --git a/common/src/test/scala/game/HackMessageTest.scala b/src/test/scala/game/HackMessageTest.scala similarity index 100% rename from common/src/test/scala/game/HackMessageTest.scala rename to src/test/scala/game/HackMessageTest.scala diff --git a/common/src/test/scala/game/HitHintTest.scala b/src/test/scala/game/HitHintTest.scala similarity index 100% rename from common/src/test/scala/game/HitHintTest.scala rename to src/test/scala/game/HitHintTest.scala diff --git a/common/src/test/scala/game/HitMessageTest.scala b/src/test/scala/game/HitMessageTest.scala similarity index 100% rename from common/src/test/scala/game/HitMessageTest.scala rename to src/test/scala/game/HitMessageTest.scala diff --git a/common/src/test/scala/game/HotSpotUpdateMessageTest.scala b/src/test/scala/game/HotSpotUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/HotSpotUpdateMessageTest.scala rename to src/test/scala/game/HotSpotUpdateMessageTest.scala diff --git a/common/src/test/scala/game/InventoryStateMessageTest.scala b/src/test/scala/game/InventoryStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/InventoryStateMessageTest.scala rename to src/test/scala/game/InventoryStateMessageTest.scala diff --git a/common/src/test/scala/game/ItemTransactionMessageTest.scala b/src/test/scala/game/ItemTransactionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ItemTransactionMessageTest.scala rename to src/test/scala/game/ItemTransactionMessageTest.scala diff --git a/common/src/test/scala/game/ItemTransactionResultMessageTest.scala b/src/test/scala/game/ItemTransactionResultMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ItemTransactionResultMessageTest.scala rename to src/test/scala/game/ItemTransactionResultMessageTest.scala diff --git a/common/src/test/scala/game/KeepAliveMessageTest.scala b/src/test/scala/game/KeepAliveMessageTest.scala similarity index 100% rename from common/src/test/scala/game/KeepAliveMessageTest.scala rename to src/test/scala/game/KeepAliveMessageTest.scala diff --git a/common/src/test/scala/game/LashMessageTest.scala b/src/test/scala/game/LashMessageTest.scala similarity index 100% rename from common/src/test/scala/game/LashMessageTest.scala rename to src/test/scala/game/LashMessageTest.scala diff --git a/common/src/test/scala/game/LoadMapMessageTest.scala b/src/test/scala/game/LoadMapMessageTest.scala similarity index 100% rename from common/src/test/scala/game/LoadMapMessageTest.scala rename to src/test/scala/game/LoadMapMessageTest.scala diff --git a/common/src/test/scala/game/LoginMessageTest.scala b/src/test/scala/game/LoginMessageTest.scala similarity index 100% rename from common/src/test/scala/game/LoginMessageTest.scala rename to src/test/scala/game/LoginMessageTest.scala diff --git a/common/src/test/scala/game/LoginRespMessageTest.scala b/src/test/scala/game/LoginRespMessageTest.scala similarity index 100% rename from common/src/test/scala/game/LoginRespMessageTest.scala rename to src/test/scala/game/LoginRespMessageTest.scala diff --git a/common/src/test/scala/game/LootItemMessageTest.scala b/src/test/scala/game/LootItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/LootItemMessageTest.scala rename to src/test/scala/game/LootItemMessageTest.scala diff --git a/common/src/test/scala/game/MailMessageTest.scala b/src/test/scala/game/MailMessageTest.scala similarity index 100% rename from common/src/test/scala/game/MailMessageTest.scala rename to src/test/scala/game/MailMessageTest.scala diff --git a/common/src/test/scala/game/MountVehicleMsgTest.scala b/src/test/scala/game/MountVehicleMsgTest.scala similarity index 100% rename from common/src/test/scala/game/MountVehicleMsgTest.scala rename to src/test/scala/game/MountVehicleMsgTest.scala diff --git a/common/src/test/scala/game/MoveItemMessageTest.scala b/src/test/scala/game/MoveItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/MoveItemMessageTest.scala rename to src/test/scala/game/MoveItemMessageTest.scala diff --git a/common/src/test/scala/game/ObjectAttachMessageTest.scala b/src/test/scala/game/ObjectAttachMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectAttachMessageTest.scala rename to src/test/scala/game/ObjectAttachMessageTest.scala diff --git a/common/src/test/scala/game/ObjectDeleteMessageTest.scala b/src/test/scala/game/ObjectDeleteMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectDeleteMessageTest.scala rename to src/test/scala/game/ObjectDeleteMessageTest.scala diff --git a/common/src/test/scala/game/ObjectDeployedMessageTest.scala b/src/test/scala/game/ObjectDeployedMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectDeployedMessageTest.scala rename to src/test/scala/game/ObjectDeployedMessageTest.scala diff --git a/common/src/test/scala/game/ObjectDetachMessageTest.scala b/src/test/scala/game/ObjectDetachMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectDetachMessageTest.scala rename to src/test/scala/game/ObjectDetachMessageTest.scala diff --git a/common/src/test/scala/game/ObjectDetectedMessageTest.scala b/src/test/scala/game/ObjectDetectedMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectDetectedMessageTest.scala rename to src/test/scala/game/ObjectDetectedMessageTest.scala diff --git a/common/src/test/scala/game/ObjectHeldMessageTest.scala b/src/test/scala/game/ObjectHeldMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ObjectHeldMessageTest.scala rename to src/test/scala/game/ObjectHeldMessageTest.scala diff --git a/common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala b/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala similarity index 100% rename from common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala rename to src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala diff --git a/common/src/test/scala/game/OxygenStateMessageTest.scala b/src/test/scala/game/OxygenStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/OxygenStateMessageTest.scala rename to src/test/scala/game/OxygenStateMessageTest.scala diff --git a/common/src/test/scala/game/PickupItemMessageTest.scala b/src/test/scala/game/PickupItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PickupItemMessageTest.scala rename to src/test/scala/game/PickupItemMessageTest.scala diff --git a/common/src/test/scala/game/PingMsgTest.scala b/src/test/scala/game/PingMsgTest.scala similarity index 100% rename from common/src/test/scala/game/PingMsgTest.scala rename to src/test/scala/game/PingMsgTest.scala diff --git a/common/src/test/scala/game/PlanetsideAttributeMessageTest.scala b/src/test/scala/game/PlanetsideAttributeMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PlanetsideAttributeMessageTest.scala rename to src/test/scala/game/PlanetsideAttributeMessageTest.scala diff --git a/common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala b/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala rename to src/test/scala/game/PlanetsideStringAttributeMessageTest.scala diff --git a/common/src/test/scala/game/PlayerStasisMessageTest.scala b/src/test/scala/game/PlayerStasisMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PlayerStasisMessageTest.scala rename to src/test/scala/game/PlayerStasisMessageTest.scala diff --git a/common/src/test/scala/game/PlayerStateMessageTest.scala b/src/test/scala/game/PlayerStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PlayerStateMessageTest.scala rename to src/test/scala/game/PlayerStateMessageTest.scala diff --git a/common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala b/src/test/scala/game/PlayerStateMessageUpstreamTest.scala similarity index 100% rename from common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala rename to src/test/scala/game/PlayerStateMessageUpstreamTest.scala diff --git a/common/src/test/scala/game/PlayerStateShiftMessageTest.scala b/src/test/scala/game/PlayerStateShiftMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PlayerStateShiftMessageTest.scala rename to src/test/scala/game/PlayerStateShiftMessageTest.scala diff --git a/common/src/test/scala/game/ProjectileStateMessageTest.scala b/src/test/scala/game/ProjectileStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ProjectileStateMessageTest.scala rename to src/test/scala/game/ProjectileStateMessageTest.scala diff --git a/common/src/test/scala/game/PropertyOverrideMessageTest.scala b/src/test/scala/game/PropertyOverrideMessageTest.scala similarity index 100% rename from common/src/test/scala/game/PropertyOverrideMessageTest.scala rename to src/test/scala/game/PropertyOverrideMessageTest.scala diff --git a/common/src/test/scala/game/ProximityTerminalUseMessageTest.scala b/src/test/scala/game/ProximityTerminalUseMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ProximityTerminalUseMessageTest.scala rename to src/test/scala/game/ProximityTerminalUseMessageTest.scala diff --git a/common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala b/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala rename to src/test/scala/game/QuantityDeltaUpdateMessageTest.scala diff --git a/common/src/test/scala/game/QuantityUpdateMessageTest.scala b/src/test/scala/game/QuantityUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/QuantityUpdateMessageTest.scala rename to src/test/scala/game/QuantityUpdateMessageTest.scala diff --git a/common/src/test/scala/game/ReleaseAvatarRequestMessageTest.scala b/src/test/scala/game/ReleaseAvatarRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ReleaseAvatarRequestMessageTest.scala rename to src/test/scala/game/ReleaseAvatarRequestMessageTest.scala diff --git a/common/src/test/scala/game/ReloadMessageTest.scala b/src/test/scala/game/ReloadMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ReloadMessageTest.scala rename to src/test/scala/game/ReloadMessageTest.scala diff --git a/common/src/test/scala/game/RepairMessageTest.scala b/src/test/scala/game/RepairMessageTest.scala similarity index 100% rename from common/src/test/scala/game/RepairMessageTest.scala rename to src/test/scala/game/RepairMessageTest.scala diff --git a/common/src/test/scala/game/ReplicationStreamMessageTest.scala b/src/test/scala/game/ReplicationStreamMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ReplicationStreamMessageTest.scala rename to src/test/scala/game/ReplicationStreamMessageTest.scala diff --git a/common/src/test/scala/game/RequestDestroyMessageTest.scala b/src/test/scala/game/RequestDestroyMessageTest.scala similarity index 100% rename from common/src/test/scala/game/RequestDestroyMessageTest.scala rename to src/test/scala/game/RequestDestroyMessageTest.scala diff --git a/common/src/test/scala/game/ServerVehicleOverrideMsgTest.scala b/src/test/scala/game/ServerVehicleOverrideMsgTest.scala similarity index 100% rename from common/src/test/scala/game/ServerVehicleOverrideMsgTest.scala rename to src/test/scala/game/ServerVehicleOverrideMsgTest.scala diff --git a/common/src/test/scala/game/SetChatFilterMessageTest.scala b/src/test/scala/game/SetChatFilterMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SetChatFilterMessageTest.scala rename to src/test/scala/game/SetChatFilterMessageTest.scala diff --git a/common/src/test/scala/game/SetEmpireMessageTest.scala b/src/test/scala/game/SetEmpireMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SetEmpireMessageTest.scala rename to src/test/scala/game/SetEmpireMessageTest.scala diff --git a/common/src/test/scala/game/SimDataChallengeRespTest.scala b/src/test/scala/game/SimDataChallengeRespTest.scala similarity index 100% rename from common/src/test/scala/game/SimDataChallengeRespTest.scala rename to src/test/scala/game/SimDataChallengeRespTest.scala diff --git a/common/src/test/scala/game/SimDataChallengeTest.scala b/src/test/scala/game/SimDataChallengeTest.scala similarity index 100% rename from common/src/test/scala/game/SimDataChallengeTest.scala rename to src/test/scala/game/SimDataChallengeTest.scala diff --git a/common/src/test/scala/game/SpawnRequestMessageTest.scala b/src/test/scala/game/SpawnRequestMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SpawnRequestMessageTest.scala rename to src/test/scala/game/SpawnRequestMessageTest.scala diff --git a/common/src/test/scala/game/SplashHitMessageTest.scala b/src/test/scala/game/SplashHitMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SplashHitMessageTest.scala rename to src/test/scala/game/SplashHitMessageTest.scala diff --git a/common/src/test/scala/game/SquadDefinitionActionMessageTest.scala b/src/test/scala/game/SquadDefinitionActionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SquadDefinitionActionMessageTest.scala rename to src/test/scala/game/SquadDefinitionActionMessageTest.scala diff --git a/common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala b/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala rename to src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala diff --git a/common/src/test/scala/game/SquadMemberEventTest.scala b/src/test/scala/game/SquadMemberEventTest.scala similarity index 100% rename from common/src/test/scala/game/SquadMemberEventTest.scala rename to src/test/scala/game/SquadMemberEventTest.scala diff --git a/common/src/test/scala/game/SquadMembershipRequestTest.scala b/src/test/scala/game/SquadMembershipRequestTest.scala similarity index 100% rename from common/src/test/scala/game/SquadMembershipRequestTest.scala rename to src/test/scala/game/SquadMembershipRequestTest.scala diff --git a/common/src/test/scala/game/SquadMembershipResponseTest.scala b/src/test/scala/game/SquadMembershipResponseTest.scala similarity index 100% rename from common/src/test/scala/game/SquadMembershipResponseTest.scala rename to src/test/scala/game/SquadMembershipResponseTest.scala diff --git a/common/src/test/scala/game/SquadStateTest.scala b/src/test/scala/game/SquadStateTest.scala similarity index 100% rename from common/src/test/scala/game/SquadStateTest.scala rename to src/test/scala/game/SquadStateTest.scala diff --git a/common/src/test/scala/game/SquadWaypointEventTest.scala b/src/test/scala/game/SquadWaypointEventTest.scala similarity index 100% rename from common/src/test/scala/game/SquadWaypointEventTest.scala rename to src/test/scala/game/SquadWaypointEventTest.scala diff --git a/common/src/test/scala/game/TargetingImplantRequestTest.scala b/src/test/scala/game/TargetingImplantRequestTest.scala similarity index 100% rename from common/src/test/scala/game/TargetingImplantRequestTest.scala rename to src/test/scala/game/TargetingImplantRequestTest.scala diff --git a/common/src/test/scala/game/TargetingInfoMessageTest.scala b/src/test/scala/game/TargetingInfoMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TargetingInfoMessageTest.scala rename to src/test/scala/game/TargetingInfoMessageTest.scala diff --git a/common/src/test/scala/game/TimeOfDayMessageTest.scala b/src/test/scala/game/TimeOfDayMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TimeOfDayMessageTest.scala rename to src/test/scala/game/TimeOfDayMessageTest.scala diff --git a/common/src/test/scala/game/TrainingZoneMessageTest.scala b/src/test/scala/game/TrainingZoneMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TrainingZoneMessageTest.scala rename to src/test/scala/game/TrainingZoneMessageTest.scala diff --git a/common/src/test/scala/game/TriggerEffectMessageTest.scala b/src/test/scala/game/TriggerEffectMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TriggerEffectMessageTest.scala rename to src/test/scala/game/TriggerEffectMessageTest.scala diff --git a/common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala b/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala rename to src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala diff --git a/common/src/test/scala/game/TriggerSoundMessageTest.scala b/src/test/scala/game/TriggerSoundMessageTest.scala similarity index 100% rename from common/src/test/scala/game/TriggerSoundMessageTest.scala rename to src/test/scala/game/TriggerSoundMessageTest.scala diff --git a/common/src/test/scala/game/UnuseItemMessageTest.scala b/src/test/scala/game/UnuseItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/UnuseItemMessageTest.scala rename to src/test/scala/game/UnuseItemMessageTest.scala diff --git a/common/src/test/scala/game/UseItemMessageTest.scala b/src/test/scala/game/UseItemMessageTest.scala similarity index 100% rename from common/src/test/scala/game/UseItemMessageTest.scala rename to src/test/scala/game/UseItemMessageTest.scala diff --git a/common/src/test/scala/game/VNLWorldStatusMessageTest.scala b/src/test/scala/game/VNLWorldStatusMessageTest.scala similarity index 100% rename from common/src/test/scala/game/VNLWorldStatusMessageTest.scala rename to src/test/scala/game/VNLWorldStatusMessageTest.scala diff --git a/common/src/test/scala/game/VehicleStateMessageTest.scala b/src/test/scala/game/VehicleStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/VehicleStateMessageTest.scala rename to src/test/scala/game/VehicleStateMessageTest.scala diff --git a/common/src/test/scala/game/VehicleSubStateMessageTest.scala b/src/test/scala/game/VehicleSubStateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/VehicleSubStateMessageTest.scala rename to src/test/scala/game/VehicleSubStateMessageTest.scala diff --git a/common/src/test/scala/game/VoiceHostInfoTest.scala b/src/test/scala/game/VoiceHostInfoTest.scala similarity index 100% rename from common/src/test/scala/game/VoiceHostInfoTest.scala rename to src/test/scala/game/VoiceHostInfoTest.scala diff --git a/common/src/test/scala/game/VoiceHostKillTest.scala b/src/test/scala/game/VoiceHostKillTest.scala similarity index 100% rename from common/src/test/scala/game/VoiceHostKillTest.scala rename to src/test/scala/game/VoiceHostKillTest.scala diff --git a/common/src/test/scala/game/VoiceHostRequestTest.scala b/src/test/scala/game/VoiceHostRequestTest.scala similarity index 100% rename from common/src/test/scala/game/VoiceHostRequestTest.scala rename to src/test/scala/game/VoiceHostRequestTest.scala diff --git a/common/src/test/scala/game/WarpgateRequestTest.scala b/src/test/scala/game/WarpgateRequestTest.scala similarity index 100% rename from common/src/test/scala/game/WarpgateRequestTest.scala rename to src/test/scala/game/WarpgateRequestTest.scala diff --git a/common/src/test/scala/game/WeaponDelayFireMessageTest.scala b/src/test/scala/game/WeaponDelayFireMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeaponDelayFireMessageTest.scala rename to src/test/scala/game/WeaponDelayFireMessageTest.scala diff --git a/common/src/test/scala/game/WeaponDryFireMessageTest.scala b/src/test/scala/game/WeaponDryFireMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeaponDryFireMessageTest.scala rename to src/test/scala/game/WeaponDryFireMessageTest.scala diff --git a/common/src/test/scala/game/WeaponFireMessageTest.scala b/src/test/scala/game/WeaponFireMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeaponFireMessageTest.scala rename to src/test/scala/game/WeaponFireMessageTest.scala diff --git a/common/src/test/scala/game/WeaponJammedMessageTest.scala b/src/test/scala/game/WeaponJammedMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeaponJammedMessageTest.scala rename to src/test/scala/game/WeaponJammedMessageTest.scala diff --git a/common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala b/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala rename to src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala diff --git a/common/src/test/scala/game/WeatherMessageTest.scala b/src/test/scala/game/WeatherMessageTest.scala similarity index 100% rename from common/src/test/scala/game/WeatherMessageTest.scala rename to src/test/scala/game/WeatherMessageTest.scala diff --git a/common/src/test/scala/game/ZipLineMessageTest.scala b/src/test/scala/game/ZipLineMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ZipLineMessageTest.scala rename to src/test/scala/game/ZipLineMessageTest.scala diff --git a/common/src/test/scala/game/ZoneForcedCavernConnectionsMessageTest.scala b/src/test/scala/game/ZoneForcedCavernConnectionsMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ZoneForcedCavernConnectionsMessageTest.scala rename to src/test/scala/game/ZoneForcedCavernConnectionsMessageTest.scala diff --git a/common/src/test/scala/game/ZoneInfoMessageTest.scala b/src/test/scala/game/ZoneInfoMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ZoneInfoMessageTest.scala rename to src/test/scala/game/ZoneInfoMessageTest.scala diff --git a/common/src/test/scala/game/ZoneLockInfoMesageTest.scala b/src/test/scala/game/ZoneLockInfoMesageTest.scala similarity index 100% rename from common/src/test/scala/game/ZoneLockInfoMesageTest.scala rename to src/test/scala/game/ZoneLockInfoMesageTest.scala diff --git a/common/src/test/scala/game/ZonePopulationUpdateMessageTest.scala b/src/test/scala/game/ZonePopulationUpdateMessageTest.scala similarity index 100% rename from common/src/test/scala/game/ZonePopulationUpdateMessageTest.scala rename to src/test/scala/game/ZonePopulationUpdateMessageTest.scala diff --git a/common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala b/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala rename to src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala b/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala rename to src/test/scala/game/objectcreate/CaptureFlagDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/CharacterDataTest.scala b/src/test/scala/game/objectcreate/CharacterDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/CharacterDataTest.scala rename to src/test/scala/game/objectcreate/CharacterDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala b/src/test/scala/game/objectcreate/CommonFieldDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala rename to src/test/scala/game/objectcreate/CommonFieldDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala b/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala rename to src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala diff --git a/common/src/test/scala/game/objectcreate/HandheldDataTest.scala b/src/test/scala/game/objectcreate/HandheldDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/HandheldDataTest.scala rename to src/test/scala/game/objectcreate/HandheldDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala b/src/test/scala/game/objectcreate/LockerContainerDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala rename to src/test/scala/game/objectcreate/LockerContainerDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala b/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala rename to src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/REKDataTest.scala b/src/test/scala/game/objectcreate/REKDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/REKDataTest.scala rename to src/test/scala/game/objectcreate/REKDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala b/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala rename to src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/RibbonBarsTest.scala b/src/test/scala/game/objectcreate/RibbonBarsTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/RibbonBarsTest.scala rename to src/test/scala/game/objectcreate/RibbonBarsTest.scala diff --git a/common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala b/src/test/scala/game/objectcreate/SmallTurretDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala rename to src/test/scala/game/objectcreate/SmallTurretDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/TRAPDataTest.scala b/src/test/scala/game/objectcreate/TRAPDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/TRAPDataTest.scala rename to src/test/scala/game/objectcreate/TRAPDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala b/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala rename to src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala diff --git a/common/src/test/scala/game/objectcreate/WeaponDataTest.scala b/src/test/scala/game/objectcreate/WeaponDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreate/WeaponDataTest.scala rename to src/test/scala/game/objectcreate/WeaponDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala b/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala rename to src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala diff --git a/common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala b/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala similarity index 100% rename from common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala rename to src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala diff --git a/common/src/test/scala/objects/AvatarTest.scala b/src/test/scala/objects/AvatarTest.scala similarity index 100% rename from common/src/test/scala/objects/AvatarTest.scala rename to src/test/scala/objects/AvatarTest.scala diff --git a/common/src/test/scala/objects/BuildingTest.scala b/src/test/scala/objects/BuildingTest.scala similarity index 100% rename from common/src/test/scala/objects/BuildingTest.scala rename to src/test/scala/objects/BuildingTest.scala diff --git a/common/src/test/scala/objects/ContainerTest.scala b/src/test/scala/objects/ContainerTest.scala similarity index 100% rename from common/src/test/scala/objects/ContainerTest.scala rename to src/test/scala/objects/ContainerTest.scala diff --git a/common/src/test/scala/objects/ConverterTest.scala b/src/test/scala/objects/ConverterTest.scala similarity index 100% rename from common/src/test/scala/objects/ConverterTest.scala rename to src/test/scala/objects/ConverterTest.scala diff --git a/common/src/test/scala/objects/DamageModelTests.scala b/src/test/scala/objects/DamageModelTests.scala similarity index 100% rename from common/src/test/scala/objects/DamageModelTests.scala rename to src/test/scala/objects/DamageModelTests.scala diff --git a/common/src/test/scala/objects/DamageableTest.scala b/src/test/scala/objects/DamageableTest.scala similarity index 99% rename from common/src/test/scala/objects/DamageableTest.scala rename to src/test/scala/objects/DamageableTest.scala index d3ec3144..6cce2e8b 100644 --- a/common/src/test/scala/objects/DamageableTest.scala +++ b/src/test/scala/objects/DamageableTest.scala @@ -21,11 +21,11 @@ import net.psforever.objects.vital.Vitality import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.DamageWithPositionMessage import net.psforever.types._ -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.support.SupportActor -import services.vehicle.support.TurretUpgrader -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.support.SupportActor +import net.psforever.services.vehicle.support.TurretUpgrader +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import org.specs2.mutable.Specification import scala.concurrent.duration._ import net.psforever.objects.avatar.Avatar diff --git a/common/src/test/scala/objects/DefaultTest.scala b/src/test/scala/objects/DefaultTest.scala similarity index 100% rename from common/src/test/scala/objects/DefaultTest.scala rename to src/test/scala/objects/DefaultTest.scala diff --git a/common/src/test/scala/objects/DeployableTest.scala b/src/test/scala/objects/DeployableTest.scala similarity index 99% rename from common/src/test/scala/objects/DeployableTest.scala rename to src/test/scala/objects/DeployableTest.scala index e22140a9..e96e4cfe 100644 --- a/common/src/test/scala/objects/DeployableTest.scala +++ b/src/test/scala/objects/DeployableTest.scala @@ -15,10 +15,10 @@ import net.psforever.objects.{TurretDeployable, _} import net.psforever.packet.game.{DeployableIcon, DeployableInfo, DeploymentAction} import net.psforever.types._ import org.specs2.mutable.Specification -import services.{RemoverActor, Service} -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.local.{LocalAction, LocalServiceMessage} -import services.support.SupportActor +import net.psforever.services.{RemoverActor, Service} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.local.{LocalAction, LocalServiceMessage} +import net.psforever.services.support.SupportActor import net.psforever.objects.avatar.Avatar import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/DeployableToolboxTest.scala b/src/test/scala/objects/DeployableToolboxTest.scala similarity index 100% rename from common/src/test/scala/objects/DeployableToolboxTest.scala rename to src/test/scala/objects/DeployableToolboxTest.scala diff --git a/common/src/test/scala/objects/DeploymentTest.scala b/src/test/scala/objects/DeploymentTest.scala similarity index 79% rename from common/src/test/scala/objects/DeploymentTest.scala rename to src/test/scala/objects/DeploymentTest.scala index 1a5b95cf..ca83ddc1 100644 --- a/common/src/test/scala/objects/DeploymentTest.scala +++ b/src/test/scala/objects/DeploymentTest.scala @@ -10,7 +10,7 @@ import net.psforever.objects.serverobject.deploy.{Deployment, DeploymentBehavior import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.types.{DriveState, PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable.Specification -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration.Duration @@ -58,8 +58,8 @@ class DeploymentBehavior1Test extends ActorTest { class DeploymentBehavior2Test extends ActorTest { "Deployment" should { "change following a deployment cycle using TryDeploymentChange" in { - val obj = DeploymentTest.SetUpAgent - val probe = new TestProbe(system) + val obj = DeploymentTest.SetUpAgent + val probe = new TestProbe(system) val eventsProbe = new TestProbe(system) obj.Zone.VehicleEvents = eventsProbe.ref assert(obj.DeploymentState == DriveState.Mobile) @@ -68,17 +68,25 @@ class DeploymentBehavior2Test extends ActorTest { val reply1a = probe.receiveOne(Duration.create(500, "ms")) assert(reply1a match { case Deployment.CanDeploy(_, DriveState.Deploying) => true - case _ => false + case _ => false }) val reply1b = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply1b match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deploying, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deploying, 0, false, Vector3.Zero) + ) => + true case _ => false }) //to Deployed val reply2 = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply2 match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deployed, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deployed, 0, false, Vector3.Zero) + ) => + true case _ => false }) assert(obj.DeploymentState == DriveState.Deployed) @@ -87,17 +95,25 @@ class DeploymentBehavior2Test extends ActorTest { val reply3a = probe.receiveOne(Duration.create(500, "ms")) assert(reply3a match { case Deployment.CanUndeploy(_, DriveState.Undeploying) => true - case _ => false + case _ => false }) val reply3b = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply3b match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Undeploying, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Undeploying, 0, false, Vector3.Zero) + ) => + true case _ => false }) //to Mobile val reply4 = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply4 match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Mobile, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Mobile, 0, false, Vector3.Zero) + ) => + true case _ => false }) assert(obj.DeploymentState == DriveState.Mobile) @@ -108,8 +124,8 @@ class DeploymentBehavior2Test extends ActorTest { class DeploymentBehavior3Test extends ActorTest { "Deployment" should { "change following a deployment cycle using TryDeploy and TryUndeploy" in { - val obj = DeploymentTest.SetUpAgent - val probe = new TestProbe(system) + val obj = DeploymentTest.SetUpAgent + val probe = new TestProbe(system) val eventsProbe = new TestProbe(system) obj.Zone.VehicleEvents = eventsProbe.ref assert(obj.DeploymentState == DriveState.Mobile) @@ -118,17 +134,25 @@ class DeploymentBehavior3Test extends ActorTest { val reply1a = probe.receiveOne(Duration.create(500, "ms")) assert(reply1a match { case Deployment.CanDeploy(_, DriveState.Deploying) => true - case _ => false + case _ => false }) val reply1b = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply1b match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deploying, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deploying, 0, false, Vector3.Zero) + ) => + true case _ => false }) //to Deployed val reply2 = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply2 match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deployed, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Deployed, 0, false, Vector3.Zero) + ) => + true case _ => false }) assert(obj.DeploymentState == DriveState.Deployed) @@ -137,17 +161,25 @@ class DeploymentBehavior3Test extends ActorTest { val reply3a = probe.receiveOne(Duration.create(500, "ms")) assert(reply3a match { case Deployment.CanUndeploy(_, DriveState.Undeploying) => true - case _ => false + case _ => false }) val reply3b = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply3b match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Undeploying, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Undeploying, 0, false, Vector3.Zero) + ) => + true case _ => false }) //to Mobile val reply4 = eventsProbe.receiveOne(Duration.create(500, "ms")) assert(reply4 match { - case VehicleServiceMessage("test", VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Mobile, 0, false, Vector3.Zero)) => true + case VehicleServiceMessage( + "test", + VehicleAction.DeployRequest(_, PlanetSideGUID(1), DriveState.Mobile, 0, false, Vector3.Zero) + ) => + true case _ => false }) assert(obj.DeploymentState == DriveState.Mobile) @@ -229,7 +261,7 @@ object DeploymentTest { def SetUpAgent(implicit system: ActorSystem) = { val obj = new DeploymentObject() obj.GUID = PlanetSideGUID(1) - obj.Zone = Zone("test", new ZoneMap("test"),1) + obj.Zone = Zone("test", new ZoneMap("test"), 1) obj.Actor = system.actorOf(Props(classOf[DeploymentControl], obj), "test") obj } diff --git a/common/src/test/scala/objects/DoorTest.scala b/src/test/scala/objects/DoorTest.scala similarity index 100% rename from common/src/test/scala/objects/DoorTest.scala rename to src/test/scala/objects/DoorTest.scala diff --git a/common/src/test/scala/objects/EntityTest.scala b/src/test/scala/objects/EntityTest.scala similarity index 100% rename from common/src/test/scala/objects/EntityTest.scala rename to src/test/scala/objects/EntityTest.scala diff --git a/common/src/test/scala/objects/EquipmentSlotTest.scala b/src/test/scala/objects/EquipmentSlotTest.scala similarity index 100% rename from common/src/test/scala/objects/EquipmentSlotTest.scala rename to src/test/scala/objects/EquipmentSlotTest.scala diff --git a/common/src/test/scala/objects/EquipmentTest.scala b/src/test/scala/objects/EquipmentTest.scala similarity index 100% rename from common/src/test/scala/objects/EquipmentTest.scala rename to src/test/scala/objects/EquipmentTest.scala diff --git a/common/src/test/scala/objects/ExoSuitTest.scala b/src/test/scala/objects/ExoSuitTest.scala similarity index 100% rename from common/src/test/scala/objects/ExoSuitTest.scala rename to src/test/scala/objects/ExoSuitTest.scala diff --git a/common/src/test/scala/objects/FacilityTurretTest.scala b/src/test/scala/objects/FacilityTurretTest.scala similarity index 98% rename from common/src/test/scala/objects/FacilityTurretTest.scala rename to src/test/scala/objects/FacilityTurretTest.scala index bf6a547e..78972419 100644 --- a/common/src/test/scala/objects/FacilityTurretTest.scala +++ b/src/test/scala/objects/FacilityTurretTest.scala @@ -17,8 +17,8 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.{InventoryStateMessage, RepairMessage} import net.psforever.types._ import org.specs2.mutable.Specification -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.collection.mutable import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/FactionAffinityTest.scala b/src/test/scala/objects/FactionAffinityTest.scala similarity index 100% rename from common/src/test/scala/objects/FactionAffinityTest.scala rename to src/test/scala/objects/FactionAffinityTest.scala diff --git a/common/src/test/scala/objects/FireModeTest.scala b/src/test/scala/objects/FireModeTest.scala similarity index 100% rename from common/src/test/scala/objects/FireModeTest.scala rename to src/test/scala/objects/FireModeTest.scala diff --git a/common/src/test/scala/objects/GeneratorTest.scala b/src/test/scala/objects/GeneratorTest.scala similarity index 99% rename from common/src/test/scala/objects/GeneratorTest.scala rename to src/test/scala/objects/GeneratorTest.scala index a9e5a8fa..d334f156 100644 --- a/common/src/test/scala/objects/GeneratorTest.scala +++ b/src/test/scala/objects/GeneratorTest.scala @@ -17,7 +17,7 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.{InventoryStateMessage, RepairMessage, TriggerEffectMessage} import net.psforever.types._ import org.specs2.mutable.Specification -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/IFFLockTest.scala b/src/test/scala/objects/IFFLockTest.scala similarity index 100% rename from common/src/test/scala/objects/IFFLockTest.scala rename to src/test/scala/objects/IFFLockTest.scala diff --git a/common/src/test/scala/objects/InventoryTest.scala b/src/test/scala/objects/InventoryTest.scala similarity index 100% rename from common/src/test/scala/objects/InventoryTest.scala rename to src/test/scala/objects/InventoryTest.scala diff --git a/common/src/test/scala/objects/LoadoutTest.scala b/src/test/scala/objects/LoadoutTest.scala similarity index 100% rename from common/src/test/scala/objects/LoadoutTest.scala rename to src/test/scala/objects/LoadoutTest.scala diff --git a/common/src/test/scala/objects/LockerTest.scala b/src/test/scala/objects/LockerTest.scala similarity index 100% rename from common/src/test/scala/objects/LockerTest.scala rename to src/test/scala/objects/LockerTest.scala diff --git a/common/src/test/scala/objects/MountableTest.scala b/src/test/scala/objects/MountableTest.scala similarity index 100% rename from common/src/test/scala/objects/MountableTest.scala rename to src/test/scala/objects/MountableTest.scala diff --git a/common/src/test/scala/objects/PlayerControlTest.scala b/src/test/scala/objects/PlayerControlTest.scala similarity index 99% rename from common/src/test/scala/objects/PlayerControlTest.scala rename to src/test/scala/objects/PlayerControlTest.scala index 04a750fb..56b34460 100644 --- a/common/src/test/scala/objects/PlayerControlTest.scala +++ b/src/test/scala/objects/PlayerControlTest.scala @@ -14,8 +14,8 @@ import net.psforever.objects._ import net.psforever.objects.serverobject.CommonMessages import net.psforever.packet.game._ import net.psforever.types._ -import services.Service -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.Service +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/PlayerTest.scala b/src/test/scala/objects/PlayerTest.scala similarity index 100% rename from common/src/test/scala/objects/PlayerTest.scala rename to src/test/scala/objects/PlayerTest.scala diff --git a/common/src/test/scala/objects/ProjectileTest.scala b/src/test/scala/objects/ProjectileTest.scala similarity index 100% rename from common/src/test/scala/objects/ProjectileTest.scala rename to src/test/scala/objects/ProjectileTest.scala diff --git a/common/src/test/scala/objects/RepairableTest.scala b/src/test/scala/objects/RepairableTest.scala similarity index 99% rename from common/src/test/scala/objects/RepairableTest.scala rename to src/test/scala/objects/RepairableTest.scala index 222ad506..da89a9c1 100644 --- a/common/src/test/scala/objects/RepairableTest.scala +++ b/src/test/scala/objects/RepairableTest.scala @@ -17,8 +17,8 @@ import net.psforever.objects.vehicles.VehicleControl import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.{InventoryStateMessage, RepairMessage} import net.psforever.types._ -import services.avatar.{AvatarAction, AvatarServiceMessage} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/ResourceSiloTest.scala b/src/test/scala/objects/ResourceSiloTest.scala similarity index 99% rename from common/src/test/scala/objects/ResourceSiloTest.scala rename to src/test/scala/objects/ResourceSiloTest.scala index 04509ba4..f7a3a9d0 100644 --- a/common/src/test/scala/objects/ResourceSiloTest.scala +++ b/src/test/scala/objects/ResourceSiloTest.scala @@ -17,8 +17,8 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.UseItemMessage import net.psforever.types._ import org.specs2.mutable.Specification -import services.ServiceManager -import services.avatar.{AvatarAction, AvatarServiceMessage} +import net.psforever.services.ServiceManager +import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import akka.actor.typed.scaladsl.adapter._ import net.psforever.objects.avatar.Avatar diff --git a/common/src/test/scala/objects/ServerObjectBuilderTest.scala b/src/test/scala/objects/ServerObjectBuilderTest.scala similarity index 100% rename from common/src/test/scala/objects/ServerObjectBuilderTest.scala rename to src/test/scala/objects/ServerObjectBuilderTest.scala diff --git a/common/src/test/scala/objects/SpawnTubeTest.scala b/src/test/scala/objects/SpawnTubeTest.scala similarity index 100% rename from common/src/test/scala/objects/SpawnTubeTest.scala rename to src/test/scala/objects/SpawnTubeTest.scala diff --git a/common/src/test/scala/objects/UtilityTest.scala b/src/test/scala/objects/UtilityTest.scala similarity index 100% rename from common/src/test/scala/objects/UtilityTest.scala rename to src/test/scala/objects/UtilityTest.scala diff --git a/common/src/test/scala/objects/VehicleSpawnPadTest.scala b/src/test/scala/objects/VehicleSpawnPadTest.scala similarity index 100% rename from common/src/test/scala/objects/VehicleSpawnPadTest.scala rename to src/test/scala/objects/VehicleSpawnPadTest.scala diff --git a/common/src/test/scala/objects/VehicleTest.scala b/src/test/scala/objects/VehicleTest.scala similarity index 99% rename from common/src/test/scala/objects/VehicleTest.scala rename to src/test/scala/objects/VehicleTest.scala index ac12ae3b..9992e8fb 100644 --- a/common/src/test/scala/objects/VehicleTest.scala +++ b/src/test/scala/objects/VehicleTest.scala @@ -15,8 +15,8 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.packet.game.{CargoMountPointStatusMessage, ObjectDetachMessage, PlanetsideAttributeMessage} import net.psforever.types.{PlanetSideGUID, _} import org.specs2.mutable._ -import services.{RemoverActor, ServiceManager} -import services.vehicle.{VehicleAction, VehicleServiceMessage} +import net.psforever.services.{RemoverActor, ServiceManager} +import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ import akka.actor.typed.scaladsl.adapter._ diff --git a/common/src/test/scala/objects/VitalityTest.scala b/src/test/scala/objects/VitalityTest.scala similarity index 100% rename from common/src/test/scala/objects/VitalityTest.scala rename to src/test/scala/objects/VitalityTest.scala diff --git a/common/src/test/scala/objects/ZoneTest.scala b/src/test/scala/objects/ZoneTest.scala similarity index 100% rename from common/src/test/scala/objects/ZoneTest.scala rename to src/test/scala/objects/ZoneTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterAmmoTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterAmmoTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterAmmoTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterAmmoTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterAvatarTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterAvatarTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterAvatarTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterAvatarTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterObjectTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterObjectTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterObjectTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterObjectTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterPlayerTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterPlayerTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterPlayerTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterPlayerTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterToolTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterToolTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterToolTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterToolTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterTurretTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterTurretTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterTurretTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterTurretTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskRegisterVehicleTest.scala b/src/test/scala/objects/guidtask/GUIDTaskRegisterVehicleTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskRegisterVehicleTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskRegisterVehicleTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskTest.scala b/src/test/scala/objects/guidtask/GUIDTaskTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterAmmoTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterAmmoTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterAmmoTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterAmmoTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterAvatarTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterAvatarTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterAvatarTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterAvatarTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterObjectTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterObjectTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterObjectTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterObjectTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterPlayerTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterPlayerTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterPlayerTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterPlayerTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterToolTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterToolTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterToolTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterToolTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterTurretTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterTurretTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterTurretTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterTurretTest.scala diff --git a/common/src/test/scala/objects/guidtask/GUIDTaskUnregisterVehicleTest.scala b/src/test/scala/objects/guidtask/GUIDTaskUnregisterVehicleTest.scala similarity index 100% rename from common/src/test/scala/objects/guidtask/GUIDTaskUnregisterVehicleTest.scala rename to src/test/scala/objects/guidtask/GUIDTaskUnregisterVehicleTest.scala diff --git a/common/src/test/scala/objects/number/NumberPoolActorTest.scala b/src/test/scala/objects/number/NumberPoolActorTest.scala similarity index 100% rename from common/src/test/scala/objects/number/NumberPoolActorTest.scala rename to src/test/scala/objects/number/NumberPoolActorTest.scala diff --git a/common/src/test/scala/objects/number/NumberPoolHubTest.scala b/src/test/scala/objects/number/NumberPoolHubTest.scala similarity index 100% rename from common/src/test/scala/objects/number/NumberPoolHubTest.scala rename to src/test/scala/objects/number/NumberPoolHubTest.scala diff --git a/common/src/test/scala/objects/number/NumberPoolTest.scala b/src/test/scala/objects/number/NumberPoolTest.scala similarity index 100% rename from common/src/test/scala/objects/number/NumberPoolTest.scala rename to src/test/scala/objects/number/NumberPoolTest.scala diff --git a/common/src/test/scala/objects/number/NumberSelectorTest.scala b/src/test/scala/objects/number/NumberSelectorTest.scala similarity index 100% rename from common/src/test/scala/objects/number/NumberSelectorTest.scala rename to src/test/scala/objects/number/NumberSelectorTest.scala diff --git a/common/src/test/scala/objects/number/NumberSourceTest.scala b/src/test/scala/objects/number/NumberSourceTest.scala similarity index 100% rename from common/src/test/scala/objects/number/NumberSourceTest.scala rename to src/test/scala/objects/number/NumberSourceTest.scala diff --git a/common/src/test/scala/objects/number/RegisterTest.scala b/src/test/scala/objects/number/RegisterTest.scala similarity index 100% rename from common/src/test/scala/objects/number/RegisterTest.scala rename to src/test/scala/objects/number/RegisterTest.scala diff --git a/common/src/test/scala/objects/number/UniqueNumberSystemTest.scala b/src/test/scala/objects/number/UniqueNumberSystemTest.scala similarity index 100% rename from common/src/test/scala/objects/number/UniqueNumberSystemTest.scala rename to src/test/scala/objects/number/UniqueNumberSystemTest.scala diff --git a/common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala b/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala similarity index 100% rename from common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala rename to src/test/scala/objects/terminal/ImplantTerminalMechTest.scala diff --git a/common/src/test/scala/objects/terminal/MatrixTerminalTest.scala b/src/test/scala/objects/terminal/MatrixTerminalTest.scala similarity index 100% rename from common/src/test/scala/objects/terminal/MatrixTerminalTest.scala rename to src/test/scala/objects/terminal/MatrixTerminalTest.scala diff --git a/common/src/test/scala/objects/terminal/OrderTerminalTest.scala b/src/test/scala/objects/terminal/OrderTerminalTest.scala similarity index 100% rename from common/src/test/scala/objects/terminal/OrderTerminalTest.scala rename to src/test/scala/objects/terminal/OrderTerminalTest.scala diff --git a/common/src/test/scala/objects/terminal/ProximityTest.scala b/src/test/scala/objects/terminal/ProximityTest.scala similarity index 99% rename from common/src/test/scala/objects/terminal/ProximityTest.scala rename to src/test/scala/objects/terminal/ProximityTest.scala index fc00499d..b7f31d67 100644 --- a/common/src/test/scala/objects/terminal/ProximityTest.scala +++ b/src/test/scala/objects/terminal/ProximityTest.scala @@ -19,8 +19,8 @@ import net.psforever.objects.zones.{Zone, ZoneMap} import net.psforever.objects.{GlobalDefinitions, Player} import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification -import services.Service -import services.local.LocalService +import net.psforever.services.Service +import net.psforever.services.local.LocalService import scala.concurrent.duration._ import akka.actor.typed.scaladsl.adapter._ diff --git a/common/src/test/scala/objects/terminal/TerminalControlTest.scala b/src/test/scala/objects/terminal/TerminalControlTest.scala similarity index 100% rename from common/src/test/scala/objects/terminal/TerminalControlTest.scala rename to src/test/scala/objects/terminal/TerminalControlTest.scala diff --git a/common/src/test/scala/service/LocalServiceTest.scala b/src/test/scala/service/LocalServiceTest.scala similarity index 99% rename from common/src/test/scala/service/LocalServiceTest.scala rename to src/test/scala/service/LocalServiceTest.scala index 5e5dc554..ef7d7566 100644 --- a/common/src/test/scala/service/LocalServiceTest.scala +++ b/src/test/scala/service/LocalServiceTest.scala @@ -10,8 +10,8 @@ import net.psforever.objects.vehicles.VehicleControl import net.psforever.objects.zones.Zone import net.psforever.packet.game._ import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} -import services.{Service, ServiceManager} -import services.local._ +import net.psforever.services.{Service, ServiceManager} +import net.psforever.services.local._ class LocalService1Test extends ActorTest { ServiceManager.boot(system) diff --git a/common/src/test/scala/service/RemoverActorTest.scala b/src/test/scala/service/RemoverActorTest.scala similarity index 99% rename from common/src/test/scala/service/RemoverActorTest.scala rename to src/test/scala/service/RemoverActorTest.scala index d6dbf984..1523f661 100644 --- a/common/src/test/scala/service/RemoverActorTest.scala +++ b/src/test/scala/service/RemoverActorTest.scala @@ -6,7 +6,7 @@ import akka.actor.ActorRef import net.psforever.objects.definition.EquipmentDefinition import net.psforever.objects.equipment.Equipment import net.psforever.types.PlanetSideGUID -import services.RemoverActor +import net.psforever.services.RemoverActor //import akka.actor.{ActorRef, Props} //import akka.routing.RandomPool @@ -18,7 +18,7 @@ import services.RemoverActor //import net.psforever.objects.guid.TaskResolver //import net.psforever.objects.zones.{Zone, ZoneMap} //import net.psforever.types.PlanetSideGUID -//import services.{RemoverActor, ServiceManager} +//import net.psforever.services.{RemoverActor, ServiceManager} import scala.concurrent.duration._ import scala.util.Success diff --git a/common/src/test/scala/service/RouterTelepadActivationTest.scala b/src/test/scala/service/RouterTelepadActivationTest.scala similarity index 98% rename from common/src/test/scala/service/RouterTelepadActivationTest.scala rename to src/test/scala/service/RouterTelepadActivationTest.scala index d2a35ef5..e5b21f4a 100644 --- a/common/src/test/scala/service/RouterTelepadActivationTest.scala +++ b/src/test/scala/service/RouterTelepadActivationTest.scala @@ -6,8 +6,8 @@ import base.ActorTest import net.psforever.objects._ import net.psforever.objects.zones.Zone import net.psforever.types.PlanetSideGUID -import services.local.support.RouterTelepadActivation -import services.support.SupportActor +import net.psforever.services.local.support.RouterTelepadActivation +import net.psforever.services.support.SupportActor import scala.concurrent.duration._ diff --git a/common/src/test/scala/service/VehicleServiceTest.scala b/src/test/scala/service/VehicleServiceTest.scala similarity index 99% rename from common/src/test/scala/service/VehicleServiceTest.scala rename to src/test/scala/service/VehicleServiceTest.scala index 6b9b8321..63deec93 100644 --- a/common/src/test/scala/service/VehicleServiceTest.scala +++ b/src/test/scala/service/VehicleServiceTest.scala @@ -7,8 +7,8 @@ import net.psforever.objects._ import net.psforever.objects.vehicles.VehicleControl import net.psforever.objects.zones.Zone import net.psforever.types.{PlanetSideGUID, _} -import services.{Service, ServiceManager} -import services.vehicle._ +import net.psforever.services.{Service, ServiceManager} +import net.psforever.services.vehicle._ class VehicleService1Test extends ActorTest { ServiceManager.boot(system) diff --git a/tools/decode-packets/src/main/scala/DecodePackets.scala b/tools/decode-packets/src/main/scala/net/psforever/tools/decodePackets/DecodePackets.scala similarity index 86% rename from tools/decode-packets/src/main/scala/DecodePackets.scala rename to tools/decode-packets/src/main/scala/net/psforever/tools/decodePackets/DecodePackets.scala index e84eef9c..950d0cb0 100644 --- a/tools/decode-packets/src/main/scala/DecodePackets.scala +++ b/tools/decode-packets/src/main/scala/net/psforever/tools/decodePackets/DecodePackets.scala @@ -1,15 +1,20 @@ -import java.io.{File, FileWriter, BufferedWriter} +package net.psforever.tools.decodePackets + +import java.io.{BufferedWriter, File, FileWriter} import java.nio.charset.CodingErrorAction -import net.psforever.packet.PacketCoding -import scodec.bits._ -import scodec.Attempt.{Failure, Successful} import java.nio.file.{Files, Paths, StandardCopyOption} -import scala.io.{Codec, Source} -import util.control.Breaks._ -import scala.collection.parallel.CollectionConverters._ -import scopt.OParser -import sys.process._ + +import net.psforever.packet.PacketCoding import org.apache.commons.io.FileUtils +import scodec.Attempt.{Failure, Successful} +import scodec.bits._ +import scopt.OParser + +import scala.collection.parallel.CollectionConverters._ +import scala.io.{Codec, Source} +import scala.sys.process._ +import scala.util.Using +import scala.util.control.Breaks._ case class Config( outDir: String = System.getProperty("user.dir"), @@ -26,7 +31,7 @@ object DecodePackets { val parser = { import builder._ OParser.sequence( - programName("psf-decode-packets"), + programName("psforever-decode-packets"), opt[String]('o', "out-dir") .action((x, c) => c.copy(outDir = x)) .text("Output directory"), @@ -53,43 +58,40 @@ object DecodePackets { val outDir = new File(opts.outDir); if (!outDir.exists()) { outDir.mkdirs() - } else if (outDir.isFile()) { + } else if (outDir.isFile) { println(s"error: out-dir is file") sys.exit(1) } opts.files.foreach { file => if (!file.exists) { - println(s"file ${file.getAbsolutePath()} does not exist") + println(s"file ${file.getAbsolutePath} does not exist") sys.exit(1) } } - val tmpFolder = new File(System.getProperty("java.io.tmpdir") + "/psf-decode-packets") + val tmpFolder = new File(System.getProperty("java.io.tmpdir") + "/psforever-decode-packets") if (!tmpFolder.exists()) { tmpFolder.mkdirs() } opts.files.par.foreach { file => - val outFilePath = opts.outDir + "/" + file.getName().split(".gcap")(0) + ".txt" + val outFilePath = opts.outDir + "/" + file.getName.split(".gcap")(0) + ".txt" val outFile = new File(outFilePath); if (outFile.exists() && opts.skipExisting) { return } - val tmpFilePath = tmpFolder.getAbsolutePath() + "/" + file.getName().split(".gcap")(0) + ".txt" + val tmpFilePath = tmpFolder.getAbsolutePath + "/" + file.getName.split(".gcap")(0) + ".txt" val writer = new BufferedWriter(new FileWriter(new File(tmpFilePath), false)) try { - val lines = opts.preprocessed match { - case true => { - val decoder = Codec.UTF8.decoder.onMalformedInput(CodingErrorAction.REPORT) - Source.fromFile(file.getAbsolutePath())(decoder).getLines() - } - case false => { - Source.fromString(s"gcapy -xa '${file.getAbsolutePath()}'" !!).getLines() - } + val lines = if (opts.preprocessed) { + val decoder = Codec.UTF8.decoder.onMalformedInput(CodingErrorAction.REPORT) + Using(Source.fromFile(file.getAbsolutePath)(decoder)) { source => source.getLines() }.get + } else { + Using(Source.fromString(s"gcapy -xa '${file.getAbsolutePath}'" !!)) { source => source.getLines() }.get } var linesToSkip = 0 diff --git a/tools/decode-packets/src/main/scala/xtoolspar.scala b/tools/decode-packets/src/main/scala/xtoolspar.scala deleted file mode 100644 index f54b8248..00000000 --- a/tools/decode-packets/src/main/scala/xtoolspar.scala +++ /dev/null @@ -1,274 +0,0 @@ -/** - * Created by SouNourS on 20/12/2016. - */ - -// Make sure the input files have UTF8 encoding! - -import java.io.{BufferedWriter, File, FileWriter} -import java.nio.charset.CodingErrorAction - -import net.psforever.packet._ -import scodec.Attempt -import scodec.bits._ - -import scala.io.{Codec, Source} -import scala.collection.parallel.CollectionConverters._ - -object Xtoolspar { - - def main(args: Array[String]): Unit = { - val dirToProcess = "C:\\xtools\\in" - val dirForDecoded = "C:\\xtools\\out" - val tempDir = "C:\\xtools\\temp" - - val files = new File(dirToProcess).listFiles - - // TODO decode packet - files.par.foreach { f => - val file = new File(f.toString) - val FileToWrite = tempDir + "/" + file.getName().split(".gcapy")(0) + ".txt" - val FileToMoveTo = dirForDecoded + "/" + file.getName().split(".gcapy")(0) + ".txt" - - if (new File(FileToMoveTo).exists()) { - println(s"File ${file.getName} exists - skipping") - } else { - println(s"${FileToMoveTo} doesn't exist - Got new file ${file.getName}") - - - val FileToRead = file.toString - val fw = new BufferedWriter(new FileWriter(FileToWrite, false)) - - try { - val decoder = Codec.UTF8.decoder.onMalformedInput(CodingErrorAction.REPORT) - var i = 0 - for (line <- Source.fromFile(FileToRead)(decoder).getLines()) { - val lineTest: String = line.substring(1, 3) -// if (!lineTest.equalsIgnoreCase("IF")) { - if (i != 0) { // skip first line - //// println(ByteVector.fromValidHex(line.drop(line.lastIndexOf(' ')))) - //// println(PacketCoding.DecodePacket(ByteVector.fromValidHex(line.drop(line.lastIndexOf(' '))))) - // handlePkt(PacketCoding.DecodePacket(ByteVector.fromValidHex(line.drop(line.lastIndexOf(' '))))) - - fw.write(System.getProperty("line.separator") + "#" + line + System.getProperty("line.separator")) - var isSlotted = -1 - var isMultiPacketEx = -1 - var isMultiPacket = -1 - var isMultiPacketExSlot = -1 - var isHandleGamePacket = -1 - val decodedLine = line.drop(line.lastIndexOf(' ')) - var AfterDecode = Fdecode(decodedLine) - var AfterDecode2 = "" - var AfterDecode3 = "" - var AfterDecode4 = "" - var AfterDecode5 = "" - - isMultiPacket = AfterDecode.indexOf("Successful(MultiPacket(") - isSlotted = AfterDecode.indexOf("Successful(SlottedMetaPacket(") - isMultiPacketEx = AfterDecode.indexOf("Successful(MultiPacketEx(") - - if (isSlotted != 0 && isMultiPacket == -1 && isMultiPacketEx == -1) { - fw.write(AfterDecode + System.getProperty("line.separator")) - // println(AfterDecode ) - } - - if (isMultiPacket != -1) { - fw.write(AfterDecode + System.getProperty("line.separator")) - // println(AfterDecode) - var xindex1 = 1 - var zindex1 = 0 - var boucle1 = 0 - while (boucle1 != -1) { - AfterDecode2 = Fdecode(AfterDecode.drop(AfterDecode.indexOf(" 0x", xindex1) + 3).dropRight(AfterDecode.length - AfterDecode.indexOf(")", zindex1 + 1))) - xindex1 = AfterDecode.indexOf(" 0x", xindex1) + 1 - boucle1 = AfterDecode.indexOf(" 0x", xindex1) - zindex1 = AfterDecode.indexOf(")", zindex1) + 1 - isSlotted = AfterDecode2.indexOf("Successful(SlottedMetaPacket(") - if (isSlotted == 0) { - fw.write("> " + AfterDecode2 + System.getProperty("line.separator")) - // println("> " + AfterDecode2) - AfterDecode3 = Fdecode(AfterDecode2.drop(AfterDecode2.lastIndexOf(" 0x") + 3).dropRight(AfterDecode2.length - AfterDecode2.indexOf(")"))) - isMultiPacketExSlot = AfterDecode3.indexOf("Successful(MultiPacketEx(") - if (isMultiPacketExSlot != -1) { - fw.write("-> " + AfterDecode3 + System.getProperty("line.separator")) - // println("-> " + AfterDecode3) - var xindex2 = 1 - var zindex2 = 0 - var boucle2 = 0 - while (boucle2 != -1) { - AfterDecode4 = Fdecode(AfterDecode3.drop(AfterDecode3.indexOf(" 0x", xindex2) + 3).dropRight(AfterDecode3.length - AfterDecode3.indexOf(")", zindex2 + 1))) - xindex2 = AfterDecode3.indexOf(" 0x", xindex2) + 1 - boucle2 = AfterDecode3.indexOf(" 0x", xindex2) - zindex2 = AfterDecode3.indexOf(")", zindex2) + 1 - fw.write("--> " + AfterDecode4 + System.getProperty("line.separator")) - // println("--> " + AfterDecode4 ) - } - isMultiPacketEx = -1 - isMultiPacketExSlot = -1 - } else { - fw.write("-> " + AfterDecode3 + System.getProperty("line.separator")) - // println("-> " + AfterDecode3 ) - } - } else { - fw.write("> " + AfterDecode2 + System.getProperty("line.separator")) - // println("> " + AfterDecode2 ) - } - } - } - if (isSlotted == 0 && isMultiPacket == -1) { - fw.write(AfterDecode + System.getProperty("line.separator")) - // println(AfterDecode) - AfterDecode = Fdecode(AfterDecode.drop(AfterDecode.lastIndexOf(" 0x") + 3).dropRight(AfterDecode.length - AfterDecode.indexOf(")"))) - isMultiPacketExSlot = AfterDecode.indexOf("Successful(MultiPacketEx(") - isHandleGamePacket = AfterDecode.indexOf("Successful(HandleGamePacket(") - if (isHandleGamePacket != -1) { - fw.write("> " + AfterDecode + System.getProperty("line.separator")) - // println("> " + AfterDecode ) - if (AfterDecode.lastIndexOf(" 0x") != -1) { - AfterDecode5 = Fdecode(AfterDecode.drop(AfterDecode.lastIndexOf(" 0x") + 3).dropRight(AfterDecode.length - AfterDecode.indexOf(")"))) - fw.write("-> " + AfterDecode5 + System.getProperty("line.separator")) - // println("-> " + AfterDecode5 ) - } - } - if (isMultiPacketExSlot == -1 && isHandleGamePacket == -1) { - fw.write("> " + AfterDecode + System.getProperty("line.separator")) - // println("> " + AfterDecode ) - } - if (isMultiPacketExSlot != -1 && isHandleGamePacket == -1) { - fw.write("> " + AfterDecode + System.getProperty("line.separator")) - // println("> " + AfterDecode ) - var xindex3 = 1 - var zindex3 = 0 - var boucle3 = 0 - while (boucle3 != -1) { - AfterDecode2 = Fdecode(AfterDecode.drop(AfterDecode.indexOf(" 0x", xindex3) + 3).dropRight(AfterDecode.length - AfterDecode.indexOf(")", zindex3 + 1))) - fw.write("-> " + AfterDecode2 + System.getProperty("line.separator")) - // println("-> " + AfterDecode2) - xindex3 = AfterDecode.indexOf(" 0x", xindex3) + 1 - boucle3 = AfterDecode.indexOf(" 0x", xindex3) - zindex3 = AfterDecode.indexOf(")", zindex3) + 1 - } - } - } - if ((isMultiPacketEx != -1 || isMultiPacketExSlot != -1) && isSlotted != 0) { - fw.write(AfterDecode + System.getProperty("line.separator")) - // println( AfterDecode ) - var xindex = 1 - var zindex = 0 - var boucle = 0 - while (boucle != -1) { - AfterDecode2 = Fdecode(AfterDecode.drop(AfterDecode.indexOf(" 0x", xindex) + 3).dropRight(AfterDecode.length - AfterDecode.indexOf(")", zindex + 1))) - fw.write("> " + AfterDecode2 + System.getProperty("line.separator")) - // println("> " + AfterDecode2) - xindex = AfterDecode.indexOf(" 0x", xindex) + 1 - boucle = AfterDecode.indexOf(" 0x", xindex) - zindex = AfterDecode.indexOf(")", zindex) + 1 - } - } - } else { - i += 1 - } - } - } - catch { - case e: Throwable => - println(s"File ${file.getName} threw an exception") - e.printStackTrace() - } - finally { - fw.close() - moveFile(FileToWrite, FileToMoveTo) - } - } - } - - - - - // TODO : end - } - - import java.nio.file.{Files, Paths, StandardCopyOption} - - def moveFile(sourcePath: String, targetPath: String): Boolean = { - var flag = true - try - Files.move(Paths.get(sourcePath), Paths.get(targetPath), StandardCopyOption.REPLACE_EXISTING) - catch { - case e: Exception => - flag = false - e.printStackTrace() - } - flag - } - - def Fdecode(toto: String): String = { - val ADecode = PacketCoding.DecodePacket(ByteVector.fromValidHex(toto)).toString; - return ADecode - } - - - def handlePkt(pkt : Attempt[PlanetSidePacket]) : Unit = pkt match { - case ctrl : PlanetSideControlPacket => - println(ctrl) - // handleControlPkt(ctrl) - case game : PlanetSideGamePacket => - println(game) - // handleGamePkt(game) - case default => println(s"Invalid packet class received: $default") - } - - def handlePktContainer(pkt : PlanetSidePacketContainer) : Unit = pkt match { - case ctrl @ ControlPacket(opcode, ctrlPkt) => - // println(pkt) - println(ctrlPkt) - // handleControlPkt(ctrlPkt) - case game @ GamePacket(opcode, seq, gamePkt) => - // println(pkt) - println(gamePkt) - // handleGamePkt(gamePkt) - case default => println(s"Invalid packet container class received: $default") - } - - // def handleControlPkt(pkt : PlanetSideControlPacket) = { - // // println(pkt) - // pkt match { - // case SlottedMetaPacket(slot, subslot, innerPacket) => - //// sendResponse(PacketCoding.CreateControlPacket(SlottedMetaAck(slot, subslot))) - // - // PacketCoding.DecodePacket(innerPacket) match { - // case Failure(e) => - // println(innerPacket.toString) - // println(s"Failed to decode inner packet of SlottedMetaPacket: $e") - // case Successful(v) => - // handlePkt(v) - // } - // case sync @ ControlSync(diff, unk, f1, f2, f3, f4, fa, fb) => - // println(s"SYNC: ${sync}") - // val serverTick = Math.abs(System.nanoTime().toInt) // limit the size to prevent encoding error - //// sendResponse(PacketCoding.CreateControlPacket(ControlSyncResp(diff, serverTick, fa, fb, fb, fa))) - // case MultiPacket(packets) => - // packets.foreach { pkt => - // PacketCoding.DecodePacket(pkt) match { - // case Failure(e) => - // println(pkt.toString) - // println(s"Failed to decode inner packet of MultiPacket: $e") - // case Successful(v) => - // handlePkt(v) - // } - // } - // case MultiPacketEx(packets) => - // packets.foreach { pkt => - // PacketCoding.DecodePacket(pkt) match { - // case Failure(e) => - // println(pkt.toString) - // println(s"Failed to decode inner packet of MultiPacketEx: $e") - // case Successful(v) => - // handlePkt(v) - // } - // } - // case default => - // println(s"Unhandled ControlPacket $default") - // } - // } - -} \ No newline at end of file