diff --git a/common/src/main/scala/net/psforever/objects/Deployables.scala b/common/src/main/scala/net/psforever/objects/Deployables.scala index 3c0af9b0..7ee7d6d6 100644 --- a/common/src/main/scala/net/psforever/objects/Deployables.scala +++ b/common/src/main/scala/net/psforever/objects/Deployables.scala @@ -3,7 +3,8 @@ package net.psforever.objects import net.psforever.objects.ce.{Deployable, DeployedItem} import net.psforever.objects.serverobject.PlanetSideServerObject -import net.psforever.packet.game.{DeployableInfo, DeploymentAction, PlanetSideGUID} +import net.psforever.packet.game.{DeployableInfo, DeploymentAction} +import net.psforever.types.PlanetSideGUID import services.RemoverActor import services.local.{LocalAction, LocalServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala b/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala index 75482ecb..cfa37ead 100644 --- a/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala +++ b/common/src/main/scala/net/psforever/objects/ExplosiveDeployable.scala @@ -9,8 +9,7 @@ import net.psforever.objects.definition.converter.SmallDeployableConverter import net.psforever.objects.equipment.JammableUnit import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.vital.{StandardResolutions, Vitality} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import services.avatar.{AvatarAction, AvatarServiceMessage} import services.local.{LocalAction, LocalServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala b/common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala index dd24d89e..d63e08ab 100644 --- a/common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala +++ b/common/src/main/scala/net/psforever/objects/OwnableByPlayer.scala @@ -1,7 +1,7 @@ // Copyright (c) 2019 PSForever package net.psforever.objects -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID trait OwnableByPlayer { private var owner : Option[PlanetSideGUID] = None diff --git a/common/src/main/scala/net/psforever/objects/Player.scala b/common/src/main/scala/net/psforever/objects/Player.scala index 08e7150a..9e21aee5 100644 --- a/common/src/main/scala/net/psforever/objects/Player.scala +++ b/common/src/main/scala/net/psforever/objects/Player.scala @@ -10,9 +10,8 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.vital.resistance.ResistanceProfile import net.psforever.objects.vital.{DamageResistanceModel, Vitality} import net.psforever.objects.zones.ZoneAware -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{Cosmetics, DetailedCharacterData, PersonalStyle} -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import scala.annotation.tailrec import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/SensorDeployable.scala b/common/src/main/scala/net/psforever/objects/SensorDeployable.scala index d06688a2..18d9d075 100644 --- a/common/src/main/scala/net/psforever/objects/SensorDeployable.scala +++ b/common/src/main/scala/net/psforever/objects/SensorDeployable.scala @@ -11,7 +11,7 @@ import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.vital.{StandardResolutions, Vitality} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.Service import services.avatar.{AvatarAction, AvatarServiceMessage} import services.local.{LocalAction, LocalServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala b/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala index 8eb16fb5..15bbc408 100644 --- a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala +++ b/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala @@ -11,7 +11,7 @@ import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.vital.Vitality import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.avatar.{AvatarAction, AvatarServiceMessage} import services.Service import services.vehicle.{VehicleAction, VehicleServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/SpawnPoint.scala b/common/src/main/scala/net/psforever/objects/SpawnPoint.scala index 05eedd80..f50cd135 100644 --- a/common/src/main/scala/net/psforever/objects/SpawnPoint.scala +++ b/common/src/main/scala/net/psforever/objects/SpawnPoint.scala @@ -3,8 +3,7 @@ package net.psforever.objects import net.psforever.objects.definition.{ObjectDefinition, VehicleDefinition} import net.psforever.objects.serverobject.PlanetSideServerObject -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scala.collection.mutable diff --git a/common/src/main/scala/net/psforever/objects/TurretDeployable.scala b/common/src/main/scala/net/psforever/objects/TurretDeployable.scala index 46d9601a..dd1f30e5 100644 --- a/common/src/main/scala/net/psforever/objects/TurretDeployable.scala +++ b/common/src/main/scala/net/psforever/objects/TurretDeployable.scala @@ -14,7 +14,7 @@ import net.psforever.objects.serverobject.mount.MountableBehavior import net.psforever.objects.serverobject.turret.{TurretDefinition, WeaponTurret} import net.psforever.objects.vital.{StandardResolutions, StandardVehicleDamage, StandardVehicleResistance, Vitality} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.Service import services.avatar.{AvatarAction, AvatarServiceMessage} import services.vehicle.{VehicleAction, VehicleServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/Vehicle.scala b/common/src/main/scala/net/psforever/objects/Vehicle.scala index a2867436..2d2a7292 100644 --- a/common/src/main/scala/net/psforever/objects/Vehicle.scala +++ b/common/src/main/scala/net/psforever/objects/Vehicle.scala @@ -12,8 +12,7 @@ import net.psforever.objects.serverobject.deploy.Deployment import net.psforever.objects.serverobject.structures.AmenityOwner import net.psforever.objects.vehicles._ import net.psforever.objects.vital.{DamageResistanceModel, StandardResistanceProfile, Vitality} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.annotation.tailrec diff --git a/common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala b/common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala index c3e3358c..d9c2201e 100644 --- a/common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala +++ b/common/src/main/scala/net/psforever/objects/avatar/DeployableToolbox.scala @@ -3,8 +3,7 @@ package net.psforever.objects.avatar import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.ce.{Deployable, DeployableCategory, DeployedItem} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scala.collection.mutable diff --git a/common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala b/common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala index 8c2bc3db..8ce79ee8 100644 --- a/common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala +++ b/common/src/main/scala/net/psforever/objects/ce/TelepadLike.scala @@ -6,7 +6,7 @@ import net.psforever.objects.{PlanetSideGameObject, TelepadDeployable, Vehicle} import net.psforever.objects.serverobject.structures.Amenity import net.psforever.objects.vehicles.Utility import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID trait TelepadLike { private var router : Option[PlanetSideGUID] = None diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala index 5107547d..4334ac58 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/ACEConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.ConstructionItem -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedConstructionToolData, HandheldData} +import net.psforever.types.PlanetSideGUID import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala index 84a5a81b..4339e85e 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/AmmoBoxConverter.scala @@ -2,9 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.AmmoBox -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedAmmoBoxData} -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala index 8ed7f5f2..a2d28f02 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala @@ -3,9 +3,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Player import net.psforever.objects.equipment.{Equipment, EquipmentSlot} -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{ExoSuitType, GrenadeState, ImplantType} +import net.psforever.types.{ExoSuitType, GrenadeState, ImplantType, PlanetSideGUID} import scala.annotation.tailrec import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala index 2d1ef391..ac392624 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/BoomerTriggerConverter.scala @@ -2,9 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.SimpleItem -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedConstructionToolData, HandheldData} -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala index 7d716e56..6d90d4cc 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/CharacterSelectConverter.scala @@ -3,9 +3,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.{Player, Tool} import net.psforever.objects.equipment.{Equipment, EquipmentSlot} -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import scala.annotation.tailrec import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala index 0ce8e21c..c30408b7 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/CommandDetonaterConverter.scala @@ -2,9 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.SimpleItem -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedCommandDetonaterData, HandheldData} -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala index bef8593a..d0d59b1e 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/CorpseConverter.scala @@ -3,9 +3,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Player import net.psforever.objects.equipment.{Equipment, EquipmentSlot} -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import scala.annotation.tailrec import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala index 63b0e21a..6987669e 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/FieldTurretConverter.scala @@ -4,8 +4,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.Equipment import net.psforever.objects.serverobject.turret.WeaponTurret import net.psforever.objects.TurretDeployable -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala index 780d5f89..776bc871 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/InternalTelepadDeployableConverter.scala @@ -3,9 +3,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.ce.TelepadLike -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala index 5a4a2083..38fe6984 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/LockerContainerConverter.scala @@ -4,9 +4,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.LockerContainer import net.psforever.objects.equipment.Equipment import net.psforever.objects.inventory.GridInventory -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala index 19dba8cf..34856bf6 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/ProjectileConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.ballistics.Projectile -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, CommonFieldDataWithPlacement, FlightPhysics, PlacementData, RemoteProjectileData} +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala index 79446b2a..339c4e4f 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/REKConverter.scala @@ -2,9 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.SimpleItem -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedREKData, REKData} -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala index 6e50230f..90e33744 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/ShieldGeneratorConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.ShieldGeneratorDeployable -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala index a9175aab..bfb04db8 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/SmallDeployableConverter.scala @@ -4,8 +4,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.ce.Deployable import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.equipment.JammableUnit -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala index d740e62a..e07b0f11 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/SmallTurretConverter.scala @@ -4,8 +4,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.Equipment import net.psforever.objects.TurretDeployable import net.psforever.objects.serverobject.turret.WeaponTurret -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala index 3c423a17..a5e09253 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/TRAPConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.TrapDeployable -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala index 07114a3b..c5c6311c 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/TelepadConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Telepad -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedConstructionToolData, HandheldData} +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala index 9971940d..d2c1de01 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/TelepadDeployableConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.TelepadDeployable -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala index a51804be..de604b88 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/ToolConverter.scala @@ -2,8 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Tool -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{CommonFieldData, DetailedWeaponData, InternalSlot, WeaponData} +import net.psforever.types.PlanetSideGUID import scala.util.{Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala index 2444bef4..f62d5ec3 100644 --- a/common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala +++ b/common/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala @@ -3,9 +3,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.Equipment import net.psforever.objects.Vehicle -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types.DriveState +import net.psforever.types.{DriveState, PlanetSideGUID} import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/entity/Identifiable.scala b/common/src/main/scala/net/psforever/objects/entity/Identifiable.scala index 52327008..476bdf2c 100644 --- a/common/src/main/scala/net/psforever/objects/entity/Identifiable.scala +++ b/common/src/main/scala/net/psforever/objects/entity/Identifiable.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.entity -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * Identifiable represents anything that has its own globally unique identifier (GUID). diff --git a/common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala b/common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala index dc5e283b..406b09a4 100644 --- a/common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala +++ b/common/src/main/scala/net/psforever/objects/entity/IdentifiableEntity.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.entity -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * Represent any entity that must have its own globally unique identifier (GUID) to be functional.
diff --git a/common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala b/common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala index 1e49b64d..03f55ff8 100644 --- a/common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala +++ b/common/src/main/scala/net/psforever/objects/equipment/RemoteUnit.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.objects.equipment -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID trait RemoteUnit { private var companion : Option[PlanetSideGUID] = None diff --git a/common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala b/common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala index 763d1b60..66712417 100644 --- a/common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala +++ b/common/src/main/scala/net/psforever/objects/guid/NumberPoolHub.scala @@ -5,7 +5,7 @@ import net.psforever.objects.entity.{IdentifiableEntity, NoGUIDException} import net.psforever.objects.guid.key.LoanedKey import net.psforever.objects.guid.pool.{ExclusivePool, GenericPool, NumberPool} import net.psforever.objects.guid.source.NumberSource -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scala.util.{Failure, Success, Try} diff --git a/common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala b/common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala index 28901abe..fe8d9776 100644 --- a/common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala +++ b/common/src/main/scala/net/psforever/objects/guid/key/LoanedKey.scala @@ -36,7 +36,7 @@ class LoanedKey(private val guid : Int, private val key : Monitor) { } key.Object = obj if(obj.isDefined) { - import net.psforever.packet.game.PlanetSideGUID + import net.psforever.types.PlanetSideGUID obj.get.GUID = PlanetSideGUID(guid) } } diff --git a/common/src/main/scala/net/psforever/objects/inventory/Container.scala b/common/src/main/scala/net/psforever/objects/inventory/Container.scala index a75261eb..15257bd0 100644 --- a/common/src/main/scala/net/psforever/objects/inventory/Container.scala +++ b/common/src/main/scala/net/psforever/objects/inventory/Container.scala @@ -3,7 +3,7 @@ package net.psforever.objects.inventory import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.OffhandEquipmentSlot -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scala.util.Try diff --git a/common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala b/common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala index c7a5a28a..9693d704 100644 --- a/common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala +++ b/common/src/main/scala/net/psforever/objects/inventory/GridInventory.scala @@ -4,7 +4,7 @@ package net.psforever.objects.inventory import java.util.concurrent.atomic.AtomicInteger import net.psforever.objects.equipment.{Equipment, EquipmentSlot} -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scala.annotation.tailrec import scala.collection.mutable diff --git a/common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala b/common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala index 82c43bcc..de346c03 100644 --- a/common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala +++ b/common/src/main/scala/net/psforever/objects/inventory/InventoryItem.scala @@ -2,7 +2,7 @@ package net.psforever.objects.inventory import net.psforever.objects.equipment.Equipment -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * Represent the image placard that is used to visually and spatially manipulate an item placed into the grid-like inventory. diff --git a/common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala b/common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala index 65c0e5ff..ace2fe5b 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/hackable/Hackable.scala @@ -2,8 +2,8 @@ package net.psforever.objects.serverobject.hackable import net.psforever.objects.Player import net.psforever.objects.serverobject.affinity.FactionAffinity -import net.psforever.packet.game.{PlanetSideGUID, TriggeredSound} -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.packet.game.TriggeredSound +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} trait Hackable extends FactionAffinity { import Hackable._ diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala b/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala index 1b7251a3..aec8f8dc 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/pad/VehicleSpawnPad.scala @@ -3,7 +3,7 @@ package net.psforever.objects.serverobject.pad import net.psforever.objects.{Player, Vehicle} import net.psforever.objects.serverobject.structures.Amenity -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * A structure-owned server object that is a "spawn pad" for vehicles.
diff --git a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala b/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala index 68f9ef89..52e63fbf 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/pad/process/VehicleSpawnControlFinalClearance.scala @@ -2,8 +2,7 @@ package net.psforever.objects.serverobject.pad.process import net.psforever.objects.serverobject.pad.{VehicleSpawnControl, VehicleSpawnPad} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.ExecutionContext.Implicits.global diff --git a/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala b/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala index e2a7f794..a9ed1704 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/structures/Building.scala @@ -13,7 +13,7 @@ import net.psforever.objects.serverobject.terminals.CaptureTerminal import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.objects.zones.Zone import net.psforever.packet.game._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import scalax.collection.{Graph, GraphEdge} import services.Service import services.local.{LocalAction, LocalServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala b/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala index 4a1bb4b3..b65cd6fa 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurretControl.scala @@ -8,7 +8,7 @@ import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior} import net.psforever.objects.serverobject.affinity.{FactionAffinity, FactionAffinityBehavior} import net.psforever.objects.vital.Vitality import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.Service import services.avatar.{AvatarAction, AvatarServiceMessage} import services.vehicle.{VehicleAction, VehicleServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala b/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala index 18edfdd1..1117a40a 100644 --- a/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala +++ b/common/src/main/scala/net/psforever/objects/serverobject/turret/WeaponTurret.scala @@ -24,7 +24,9 @@ trait WeaponTurret extends FactionAffinity /** may or may not have inaccessible inventory space * see `ReserveAmmunition` in the definition */ protected val inventory : GridInventory = new GridInventory() { - import net.psforever.packet.game.PlanetSideGUID + + import net.psforever.types.PlanetSideGUID + override def Remove(index : Int) : Boolean = false override def Remove(guid : PlanetSideGUID) : Boolean = false } diff --git a/common/src/main/scala/net/psforever/objects/teamwork/Squad.scala b/common/src/main/scala/net/psforever/objects/teamwork/Squad.scala index 0ecd2e20..6b6ecd9c 100644 --- a/common/src/main/scala/net/psforever/objects/teamwork/Squad.scala +++ b/common/src/main/scala/net/psforever/objects/teamwork/Squad.scala @@ -2,8 +2,7 @@ package net.psforever.objects.teamwork import net.psforever.objects.entity.IdentifiableEntity -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CertificationType, PlanetSideEmpire} +import net.psforever.types.{CertificationType, PlanetSideEmpire, PlanetSideGUID} class Squad(squadId : PlanetSideGUID, alignment : PlanetSideEmpire.Value) extends IdentifiableEntity { super.GUID_=(squadId) diff --git a/common/src/main/scala/net/psforever/objects/vehicles/Utility.scala b/common/src/main/scala/net/psforever/objects/vehicles/Utility.scala index 64f1b9af..875be91f 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/Utility.scala +++ b/common/src/main/scala/net/psforever/objects/vehicles/Utility.scala @@ -8,8 +8,8 @@ import net.psforever.objects.ce.TelepadLike import net.psforever.objects.serverobject.structures.Amenity import net.psforever.objects.serverobject.terminals._ import net.psforever.objects.serverobject.tube.{SpawnTube, SpawnTubeDefinition} -import net.psforever.packet.game.{ItemTransactionMessage, PlanetSideGUID} -import net.psforever.types.Vector3 +import net.psforever.packet.game.ItemTransactionMessage +import net.psforever.types.{PlanetSideGUID, Vector3} /** * An `Enumeration` of the available vehicular utilities.
diff --git a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala b/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala index 78b6a72e..be7b3ebb 100644 --- a/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala +++ b/common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala @@ -10,8 +10,7 @@ import net.psforever.objects.serverobject.affinity.{FactionAffinity, FactionAffi import net.psforever.objects.serverobject.deploy.{Deployment, DeploymentBehavior} import net.psforever.objects.vital.{VehicleShieldCharge, Vitality} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{DriveState, ExoSuitType, Vector3} +import net.psforever.types.{DriveState, ExoSuitType, PlanetSideGUID, Vector3} import services.{RemoverActor, Service} import services.avatar.{AvatarAction, AvatarServiceMessage} import services.local.{LocalAction, LocalServiceMessage} diff --git a/common/src/main/scala/net/psforever/objects/zones/Zone.scala b/common/src/main/scala/net/psforever/objects/zones/Zone.scala index 157085ba..02907096 100644 --- a/common/src/main/scala/net/psforever/objects/zones/Zone.scala +++ b/common/src/main/scala/net/psforever/objects/zones/Zone.scala @@ -17,8 +17,7 @@ import net.psforever.objects.serverobject.painbox.{Painbox, PainboxDefinition} import net.psforever.objects.serverobject.resourcesilo.ResourceSilo import net.psforever.objects.serverobject.structures.{Amenity, Building, WarpGate} import net.psforever.objects.serverobject.turret.FacilityTurret -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import services.avatar.AvatarService import services.local.LocalService import services.vehicle.VehicleService diff --git a/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala b/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala index 5b4f3e67..7d41516d 100644 --- a/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala +++ b/common/src/main/scala/net/psforever/objects/zones/ZoneGroundActor.scala @@ -3,7 +3,7 @@ package net.psforever.objects.zones import akka.actor.Actor import net.psforever.objects.equipment.Equipment -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scala.annotation.tailrec import scala.collection.mutable.ListBuffer diff --git a/common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala b/common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala index 127e2b60..cfb4c637 100644 --- a/common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ActionCancelMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala b/common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala index 48c127f4..fd4ae974 100644 --- a/common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ArmorChangedMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.ExoSuitType +import net.psforever.types.{ExoSuitType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala index 35ceca1e..3353d733 100644 --- a/common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/AvatarFirstTimeEventMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala index 4096f800..8064a457 100644 --- a/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/AvatarGrenadeStateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.GrenadeState +import net.psforever.types.{GrenadeState, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala index 4505578f..9ae2e91b 100644 --- a/common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/AvatarImplantMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala index b6ed5c52..cf59e176 100644 --- a/common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/AvatarSearchCriteriaMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala b/common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala index bba69679..162a2ab0 100644 --- a/common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/AvatarVehicleTimerMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala b/common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala index d8e7cc45..6aa9d418 100644 --- a/common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/BattleExperienceMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala b/common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala index 1b813c4e..9312f252 100644 --- a/common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/CargoMountPointStatusMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.CargoStatus +import net.psforever.types.{CargoStatus, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala b/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala index 1612987a..e8c74496 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChangeAmmoMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala b/common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala index bf9409a8..88b7dab6 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChangeFireModeMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala b/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala index bd7dbb61..193032bd 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Start.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala b/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala index 571860d1..1c86426b 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChangeFireStateMessage_Stop.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala b/common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala index f5d98e84..60284987 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChangeShortcutBankMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala b/common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala index 29488447..dfba139a 100644 --- a/common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/CharacterInfoMessage.scala @@ -2,22 +2,16 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ - case class PlanetSideZoneID(zoneId : Long) object PlanetSideZoneID { implicit val codec = uint32L.as[PlanetSideZoneID] } -case class PlanetSideGUID(guid : Int) - -object PlanetSideGUID { - implicit val codec = uint16L.as[PlanetSideGUID] -} - /** * Is sent by the PlanetSide world server when sending character selection screen state. Provides metadata * about a certain character for rendering purposes (zone background, etc). Acts as an array insert for the @@ -47,4 +41,4 @@ object CharacterInfoMessage extends Marshallable[CharacterInfoMessage] { ("finished" | bool) :: ("seconds_since_last_login" | uint32L) ).as[CharacterInfoMessage] -} \ No newline at end of file +} diff --git a/common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala b/common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala index 3b9710a3..e5d575bb 100644 --- a/common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/CharacterKnowledgeMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala index fdc03eea..26191b50 100644 --- a/common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ChildObjectStateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Angular +import net.psforever.types.{Angular, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala b/common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala index 41551daf..c1bfafea 100644 --- a/common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/CreateShortcutMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala b/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala index 0fe3cb82..a56e3e7e 100644 --- a/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DamageFeedbackMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala b/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala index 08f78e9e..7ce89b8d 100644 --- a/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DamageMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Angular +import net.psforever.types.{Angular, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala b/common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala index 643898e6..5a80cd6b 100644 --- a/common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/DelayedPathMountMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala b/common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala index caaf749e..7a39c427 100644 --- a/common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DeployObjectMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala b/common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala index 7f40b7eb..b87c58b4 100644 --- a/common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DeployRequestMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{DriveState, Vector3} +import net.psforever.types.{DriveState, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala b/common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala index 4b580999..8c628000 100644 --- a/common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DeployableObjectsInfoMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala b/common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala index fdf6021b..361bb96e 100644 --- a/common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DestroyMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala b/common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala index 0e933546..4bdacad6 100644 --- a/common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/DismountBuildingMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala b/common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala index 63da8503..43bd571a 100644 --- a/common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/DismountVehicleCargoMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala b/common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala index 2a793146..6f70b114 100644 --- a/common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/DismountVehicleMsg.scala @@ -4,7 +4,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} import scodec.Codec import scodec.codecs._ -import net.psforever.types.BailType +import net.psforever.types.{BailType, PlanetSideGUID} /** * Dispatched by the client when the player wishes to get out of a vehicle. diff --git a/common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala b/common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala index 2f7024ad..bce6d8f9 100644 --- a/common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DisplayedAwardMessage.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game -import net.psforever.types.MeritCommendation +import net.psforever.types.{MeritCommendation, PlanetSideGUID} import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala index 8e03b546..ee44d327 100644 --- a/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/DropItemMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala b/common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala index 8e911a14..1bd9a8a7 100644 --- a/common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/EmoteMsg.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.EmoteType +import net.psforever.types.{EmoteType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala b/common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala index 6b1d6110..90581838 100644 --- a/common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/FacilityBenefitShieldChargeRequestMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala b/common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala index 3e28c027..7410cd38 100644 --- a/common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/FavoritesMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.LoadoutType +import net.psforever.types.{LoadoutType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala b/common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala index ac3ccb10..de86fab9 100644 --- a/common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala +++ b/common/src/main/scala/net/psforever/packet/game/FavoritesRequest.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.LoadoutType +import net.psforever.types.{LoadoutType, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala b/common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala index a724e863..5b0fe285 100644 --- a/common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/FireHintMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala b/common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala index b48e8c56..ff9c3e39 100644 --- a/common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/GenericCollisionMsg.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala b/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala index 5d87b924..5a5dba60 100644 --- a/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.bits.BitVector import scodec.{Attempt, Codec} import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala b/common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala index 8ee9b6c2..9d1f2909 100644 --- a/common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/GenericObjectStateMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/HackMessage.scala b/common/src/main/scala/net/psforever/packet/game/HackMessage.scala index 498aec43..7a126baf 100644 --- a/common/src/main/scala/net/psforever/packet/game/HackMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/HackMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/HitHint.scala b/common/src/main/scala/net/psforever/packet/game/HitHint.scala index f334af4c..a91ca2ee 100644 --- a/common/src/main/scala/net/psforever/packet/game/HitHint.scala +++ b/common/src/main/scala/net/psforever/packet/game/HitHint.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/HitMessage.scala b/common/src/main/scala/net/psforever/packet/game/HitMessage.scala index c8b3451c..1f87f6da 100644 --- a/common/src/main/scala/net/psforever/packet/game/HitMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/HitMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala index 1cf24392..22c83af3 100644 --- a/common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/InventoryStateMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala b/common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala index a861b290..4f86cb4b 100644 --- a/common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ItemTransactionMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.TransactionType +import net.psforever.types.{PlanetSideGUID, TransactionType} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala b/common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala index abf1000a..ee40f437 100644 --- a/common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ItemTransactionResultMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.TransactionType +import net.psforever.types.{PlanetSideGUID, TransactionType} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/LashMessage.scala b/common/src/main/scala/net/psforever/packet/game/LashMessage.scala index b04781d0..71137d7f 100644 --- a/common/src/main/scala/net/psforever/packet/game/LashMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/LashMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala index 77fc545b..d1c620b2 100644 --- a/common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/LootItemMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala b/common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala index 2eab06ed..b16e29da 100644 --- a/common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/MountVehicleCargoMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala b/common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala index 1bc905e7..b804e5b4 100644 --- a/common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala +++ b/common/src/main/scala/net/psforever/packet/game/MountVehicleMsg.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala index 635c0bf2..685f4a90 100644 --- a/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/MoveItemMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala index c130c1f5..c136f548 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectAttachMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala index 0c2d9363..01f4b221 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectCreateDetailedMessage.scala @@ -3,6 +3,7 @@ package net.psforever.packet.game import net.psforever.packet.game.objectcreate.{ConstructorData, ObjectClass, ObjectCreateBase, ObjectCreateMessageParent} import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.bits.BitVector import scodec.{Attempt, Codec, Err} import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala index 7fc98a58..be6eae94 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala @@ -3,6 +3,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} import net.psforever.packet.game.objectcreate.{ObjectCreateBase, _} +import net.psforever.types.PlanetSideGUID import scodec.{Attempt, Codec, Err} import scodec.bits.BitVector import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala index 00e2e085..1249a7ec 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectDeleteMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala index 5ab2d7b2..8463a10f 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectDetachMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala index d9b4cd53..18c7e040 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectDetectedMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.codecs._ import scodec.{Attempt, Codec, Err} import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala index b826d9f4..bb9c893d 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala b/common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala index b1a193ba..cdd50ce6 100644 --- a/common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/OrbitalStrikeWaypointMessage.scala @@ -3,6 +3,7 @@ package net.psforever.packet.game import net.psforever.newcodecs.newcodecs import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala index 54da0ab0..96ef7fd7 100644 --- a/common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/OxygenStateMessage.scala @@ -3,6 +3,7 @@ package net.psforever.packet.game import net.psforever.newcodecs.newcodecs import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.{Attempt, Codec} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala index e6358113..f4957153 100644 --- a/common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/PickupItemMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala b/common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala index ba67539b..3036b134 100644 --- a/common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala b/common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala index 542cc2d7..93f65952 100644 --- a/common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/PlanetsideStringAttributeMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala b/common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala index 42ddfd80..f10a1e3f 100644 --- a/common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/PlayerStasisMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala index e02fcb03..2aa94287 100644 --- a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/PlayerStateMessage.scala @@ -3,7 +3,7 @@ package net.psforever.packet.game import net.psforever.newcodecs.newcodecs import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala b/common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala index a9e2ce7b..460da534 100644 --- a/common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala +++ b/common/src/main/scala/net/psforever/packet/game/PlayerStateMessageUpstream.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala index 401b32e3..149d8dff 100644 --- a/common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ProjectileStateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala b/common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala index ac1ce9de..ca62ec8c 100644 --- a/common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ProximityTerminalUseMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala b/common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala index bec65f0a..0aad2935 100644 --- a/common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/QuantityDeltaUpdateMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala b/common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala index 1f112c3f..33e87c66 100644 --- a/common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/QuantityUpdateMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala b/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala index 02374b05..e0928600 100644 --- a/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ReloadMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/RepairMessage.scala b/common/src/main/scala/net/psforever/packet/game/RepairMessage.scala index 5e1272f9..45903f25 100644 --- a/common/src/main/scala/net/psforever/packet/game/RepairMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/RepairMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala b/common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala index c34a057c..6f0d911d 100644 --- a/common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ReplicationStreamMessage.scala @@ -3,9 +3,10 @@ package net.psforever.packet.game import net.psforever.newcodecs.newcodecs import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.{Attempt, Codec, Err} import scodec.codecs._ -import shapeless.HNil //DO NOT IMPORT shapeless.:: HERE; it interferes with required scala.collection.immutable.:: +import shapeless.HNil import scala.annotation.tailrec diff --git a/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala b/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala index 9ef39d94..2638c9bc 100644 --- a/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala b/common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala index d0361623..9bee18ae 100644 --- a/common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/RespawnAMSInfoMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala b/common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala index 0abd2c16..33b918d5 100644 --- a/common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SetCurrentAvatarMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala b/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala index 8b6d5cde..6776117d 100644 --- a/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SetEmpireMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala b/common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala index 4b72a8d5..9dd2648d 100644 --- a/common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SplashHitMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala b/common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala index ccdc41b5..a38c7aa7 100644 --- a/common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SquadDefinitionActionMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scodec.bits.BitVector import scodec.{Attempt, Codec, Err} import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala b/common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala index 270a61fb..75a274d1 100644 --- a/common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SquadDetailDefinitionUpdateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.HNil diff --git a/common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala b/common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala index 60de66e1..df53984f 100644 --- a/common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/SquadInvitationRequestMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/SquadState.scala b/common/src/main/scala/net/psforever/packet/game/SquadState.scala index dc092749..3ca30feb 100644 --- a/common/src/main/scala/net/psforever/packet/game/SquadState.scala +++ b/common/src/main/scala/net/psforever/packet/game/SquadState.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala b/common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala index 63cceeb6..f33b91ec 100644 --- a/common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala +++ b/common/src/main/scala/net/psforever/packet/game/TargetingImplantRequest.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala b/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala index b72af1f4..9816587c 100644 --- a/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala b/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala index 3f6963ca..2ff975e4 100644 --- a/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala b/common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala index 3fe3a6f2..058018d7 100644 --- a/common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TriggerEffectMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala b/common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala index 0f9335b5..594fca51 100644 --- a/common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TriggerEnvironmentalDamageMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala index 63433ded..f4508540 100644 --- a/common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/UnuseItemMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala b/common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala index 1a69248a..15f0f519 100644 --- a/common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/UseItemMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala index 0263d389..5fdab405 100644 --- a/common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/VehicleStateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.{Angular, Vector3} +import net.psforever.types.{Angular, PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala b/common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala index 8a190d71..6eea369e 100644 --- a/common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/VehicleSubStateMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala b/common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala index 5fcee854..14118419 100644 --- a/common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala +++ b/common/src/main/scala/net/psforever/packet/game/VoiceHostInfo.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.bits.ByteVector import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala b/common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala index f8f56e9d..cb776c18 100644 --- a/common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala +++ b/common/src/main/scala/net/psforever/packet/game/VoiceHostRequest.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.bits.ByteVector import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala b/common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala index bc8a0b94..a288446b 100644 --- a/common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala +++ b/common/src/main/scala/net/psforever/packet/game/WarpgateRequest.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala b/common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala index 2a52ce8d..45f8629b 100644 --- a/common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/WeaponDelayFireMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala b/common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala index 34ccf12c..99603f81 100644 --- a/common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/WeaponDryFireMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala b/common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala index eb3dc21f..cac87c61 100644 --- a/common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/WeaponFireMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala b/common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala index dc96a537..bb911d61 100644 --- a/common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/WeaponJammedMessage.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala b/common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala index 4c90f915..7c34e352 100644 --- a/common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/WeaponLazeTargetPositionMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala b/common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala index 31ba3ffd..8630b49b 100644 --- a/common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ZipLineMessage.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala index df3c7dc4..cbe21f23 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/AmmoBoxData.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * A representation of ammunition that can be created using `ObjectCreateMessage` packet data. diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala index 54f38376..2569e128 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/CharacterAppearanceData.scala @@ -1,9 +1,8 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.{Marshallable, PacketHelpers} -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala index 7620af20..63c4a3cc 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala index 790f7433..0f452cdd 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/CommonFieldDataWithPlacement.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala index f430de8a..97eab193 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedAmmoBoxData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala index beda8df1..0155f7a1 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedLockerContainerData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.codecs._ import scodec.{Attempt, Codec, Err} import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala index cc9e997c..4b1dc415 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedWeaponData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala index c338490f..23e2042a 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/InternalSlot.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.PacketHelpers -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scodec.Codec import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala index b07e3500..e6b8ecdc 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/InventoryItemData.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scodec.Codec /** diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala index 922bade8..c5bde456 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/MountItem.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scodec.Codec /** diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala index c66ea269..88becd39 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/ObjectCreateBase.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.PacketHelpers -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scodec.{Attempt, Codec, Err} import scodec.bits.BitVector import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala index 7140afd6..f3e81a73 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/OneMannedFieldTurretData.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scodec.codecs._ import scodec.{Attempt, Codec, Err} import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala index 85eb1303..9725dcac 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/Prefab.scala @@ -1,8 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{DriveState, PlanetSideEmpire} +import net.psforever.types.{DriveState, PlanetSideEmpire, PlanetSideGUID} /** * A compilation of the common `*Data` objects that would be used for stock game objects. diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala index f02df9dd..0cc3d5ee 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/SmallTurretData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.codecs._ import scodec.{Attempt, Codec, Err} import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala index 65687cc0..e7530ac6 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/TerminalData.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID /** * A representation of an object that can be interacted with when using a variety of terminals. diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala index 4030da21..5c6d453b 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala @@ -1,13 +1,12 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.{Marshallable, PacketHelpers} import scodec.Attempt.{Failure, Successful} import scodec.{Attempt, Codec, Err} -import shapeless.HNil //note: do not import shapeless.:: here; it messes up List's :: functionality +import shapeless.HNil import scodec.codecs._ -import net.psforever.types.DriveState +import net.psforever.types.{DriveState, PlanetSideGUID} import scala.collection.mutable.ListBuffer diff --git a/common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala b/common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala index fad65d96..b73274be 100644 --- a/common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala +++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/WeaponData.scala @@ -2,8 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.{Attempt, Codec, Err} import scodec.codecs._ import shapeless.{::, HNil} diff --git a/common/src/main/scala/net/psforever/types/PlanetSideGUID.scala b/common/src/main/scala/net/psforever/types/PlanetSideGUID.scala new file mode 100644 index 00000000..30aac5db --- /dev/null +++ b/common/src/main/scala/net/psforever/types/PlanetSideGUID.scala @@ -0,0 +1,9 @@ +package net.psforever.types + +import scodec.codecs.uint16L + +case class PlanetSideGUID(guid : Int) + +object PlanetSideGUID { + implicit val codec = uint16L.as[PlanetSideGUID] +} diff --git a/common/src/main/scala/services/Service.scala b/common/src/main/scala/services/Service.scala index f3a57038..23a19938 100644 --- a/common/src/main/scala/services/Service.scala +++ b/common/src/main/scala/services/Service.scala @@ -3,7 +3,7 @@ package services import akka.event.{ActorEventBus, SubchannelClassification} import akka.util.Subclassification -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID object Service { final val defaultPlayerGUID : PlanetSideGUID = PlanetSideGUID(0) diff --git a/common/src/main/scala/services/avatar/AvatarService.scala b/common/src/main/scala/services/avatar/AvatarService.scala index 2a5643cf..9af81e4a 100644 --- a/common/src/main/scala/services/avatar/AvatarService.scala +++ b/common/src/main/scala/services/avatar/AvatarService.scala @@ -3,8 +3,9 @@ package services.avatar import akka.actor.{Actor, ActorRef, Props} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +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} diff --git a/common/src/main/scala/services/avatar/AvatarServiceMessage.scala b/common/src/main/scala/services/avatar/AvatarServiceMessage.scala index 904423dc..24026e68 100644 --- a/common/src/main/scala/services/avatar/AvatarServiceMessage.scala +++ b/common/src/main/scala/services/avatar/AvatarServiceMessage.scala @@ -9,9 +9,8 @@ import net.psforever.objects.inventory.Container import net.psforever.objects.vital.resolution.ResolutionCalculations import net.psforever.objects.zones.Zone import net.psforever.packet.PlanetSideGamePacket -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{ConstructorData, ObjectCreateMessageParent} -import net.psforever.types.{ExoSuitType, PlanetSideEmpire, Vector3} +import net.psforever.types.{ExoSuitType, PlanetSideEmpire, PlanetSideGUID, Vector3} import scala.concurrent.duration.FiniteDuration diff --git a/common/src/main/scala/services/avatar/AvatarServiceResponse.scala b/common/src/main/scala/services/avatar/AvatarServiceResponse.scala index 0c589822..d38815e4 100644 --- a/common/src/main/scala/services/avatar/AvatarServiceResponse.scala +++ b/common/src/main/scala/services/avatar/AvatarServiceResponse.scala @@ -7,8 +7,8 @@ import net.psforever.objects.equipment.Equipment import net.psforever.objects.vital.resolution.ResolutionCalculations import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.ConstructorData -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} -import net.psforever.types.{ExoSuitType, PlanetSideEmpire, Vector3} +import net.psforever.packet.game.ObjectCreateMessage +import net.psforever.types.{ExoSuitType, PlanetSideEmpire, PlanetSideGUID, Vector3} import services.GenericEventBusMsg final case class AvatarServiceResponse(toChannel : String, diff --git a/common/src/main/scala/services/chat/ChatAction.scala b/common/src/main/scala/services/chat/ChatAction.scala index f1077381..4fd655be 100644 --- a/common/src/main/scala/services/chat/ChatAction.scala +++ b/common/src/main/scala/services/chat/ChatAction.scala @@ -2,8 +2,8 @@ package services.chat import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{ChatMsg, PlanetSideGUID} -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.packet.game.ChatMsg +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} object ChatAction { sealed trait Action diff --git a/common/src/main/scala/services/chat/ChatResponse.scala b/common/src/main/scala/services/chat/ChatResponse.scala index 1d7e7e52..ee386416 100644 --- a/common/src/main/scala/services/chat/ChatResponse.scala +++ b/common/src/main/scala/services/chat/ChatResponse.scala @@ -1,8 +1,7 @@ // Copyright (c) 2017 PSForever package services.chat -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.ChatMessageType +import net.psforever.types.{ChatMessageType, PlanetSideGUID} object ChatResponse { sealed trait Response diff --git a/common/src/main/scala/services/chat/ChatService.scala b/common/src/main/scala/services/chat/ChatService.scala index 085792dc..56c5897f 100644 --- a/common/src/main/scala/services/chat/ChatService.scala +++ b/common/src/main/scala/services/chat/ChatService.scala @@ -3,7 +3,7 @@ package services.chat import akka.actor.Actor import net.psforever.objects.LivePlayerList -import net.psforever.packet.game.{ChatMsg, PlanetSideGUID} +import net.psforever.packet.game.ChatMsg import net.psforever.types.ChatMessageType import services.{GenericEventBus, Service} diff --git a/common/src/main/scala/services/chat/ChatServiceResponse.scala b/common/src/main/scala/services/chat/ChatServiceResponse.scala index bfdb0016..7cda721a 100644 --- a/common/src/main/scala/services/chat/ChatServiceResponse.scala +++ b/common/src/main/scala/services/chat/ChatServiceResponse.scala @@ -2,8 +2,8 @@ package services.chat import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{ChatMsg, PlanetSideGUID} -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.packet.game.ChatMsg +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import services.GenericEventBusMsg final case class ChatServiceResponse(toChannel : String, diff --git a/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala b/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala index ec85a2a0..e6b6bd70 100644 --- a/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala +++ b/common/src/main/scala/services/galaxy/GalaxyServiceMessage.scala @@ -2,7 +2,8 @@ package services.galaxy import net.psforever.objects.Vehicle -import net.psforever.packet.game.{BuildingInfoUpdateMessage, PlanetSideGUID} +import net.psforever.packet.game.BuildingInfoUpdateMessage +import net.psforever.types.PlanetSideGUID final case class GalaxyServiceMessage(forChannel : String, actionMessage : GalaxyAction.Action) diff --git a/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala b/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala index 4d81254c..824c3ca8 100644 --- a/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala +++ b/common/src/main/scala/services/galaxy/GalaxyServiceResponse.scala @@ -3,7 +3,8 @@ package services.galaxy import net.psforever.objects.Vehicle import net.psforever.objects.zones.HotSpotInfo -import net.psforever.packet.game.{BuildingInfoUpdateMessage, PlanetSideGUID} +import net.psforever.packet.game.BuildingInfoUpdateMessage +import net.psforever.types.PlanetSideGUID import services.GenericEventBusMsg final case class GalaxyServiceResponse(toChannel : String, diff --git a/common/src/main/scala/services/local/LocalService.scala b/common/src/main/scala/services/local/LocalService.scala index 914bd5b5..419d926b 100644 --- a/common/src/main/scala/services/local/LocalService.scala +++ b/common/src/main/scala/services/local/LocalService.scala @@ -7,9 +7,9 @@ import net.psforever.objects.serverobject.structures.{Amenity, Building} import net.psforever.objects.serverobject.terminals.{CaptureTerminal, Terminal} import net.psforever.objects.zones.Zone import net.psforever.objects._ -import net.psforever.packet.game.{PlanetSideGUID, TriggeredEffect, TriggeredEffectLocation} +import net.psforever.packet.game.{TriggeredEffect, TriggeredEffectLocation} import net.psforever.objects.vital.Vitality -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import services.local.support._ import services.vehicle.{VehicleAction, VehicleServiceMessage} import services.{GenericEventBus, RemoverActor, Service} diff --git a/common/src/main/scala/services/local/LocalServiceMessage.scala b/common/src/main/scala/services/local/LocalServiceMessage.scala index ed0887c5..a09223dd 100644 --- a/common/src/main/scala/services/local/LocalServiceMessage.scala +++ b/common/src/main/scala/services/local/LocalServiceMessage.scala @@ -9,8 +9,8 @@ import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.terminals.CaptureTerminal import net.psforever.objects.vehicles.Utility import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{DeployableInfo, DeploymentAction, PlanetSideGUID, TriggeredSound} -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.packet.game.{DeployableInfo, DeploymentAction, TriggeredSound} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} final case class LocalServiceMessage(forChannel : String, actionMessage : LocalAction.Action) diff --git a/common/src/main/scala/services/local/LocalServiceResponse.scala b/common/src/main/scala/services/local/LocalServiceResponse.scala index 7d856c91..859cba65 100644 --- a/common/src/main/scala/services/local/LocalServiceResponse.scala +++ b/common/src/main/scala/services/local/LocalServiceResponse.scala @@ -6,7 +6,7 @@ import net.psforever.objects.ce.Deployable import net.psforever.objects.serverobject.terminals.{ProximityUnit, Terminal} import net.psforever.objects.vehicles.Utility import net.psforever.packet.game._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import services.GenericEventBusMsg final case class LocalServiceResponse(toChannel : String, diff --git a/common/src/main/scala/services/local/support/DeployableRemover.scala b/common/src/main/scala/services/local/support/DeployableRemover.scala index 30bd8677..e1cff388 100644 --- a/common/src/main/scala/services/local/support/DeployableRemover.scala +++ b/common/src/main/scala/services/local/support/DeployableRemover.scala @@ -5,8 +5,7 @@ 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.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import services.RemoverActor import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/local/support/DoorCloseActor.scala b/common/src/main/scala/services/local/support/DoorCloseActor.scala index 46bef0d8..e16d49da 100644 --- a/common/src/main/scala/services/local/support/DoorCloseActor.scala +++ b/common/src/main/scala/services/local/support/DoorCloseActor.scala @@ -5,8 +5,7 @@ import akka.actor.{Actor, Cancellable} import net.psforever.objects.DefaultCancellable import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scala.annotation.tailrec import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/local/support/HackCaptureActor.scala b/common/src/main/scala/services/local/support/HackCaptureActor.scala index 35405d7c..18387e8f 100644 --- a/common/src/main/scala/services/local/support/HackCaptureActor.scala +++ b/common/src/main/scala/services/local/support/HackCaptureActor.scala @@ -7,8 +7,7 @@ import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.serverobject.terminals.CaptureTerminal import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scala.concurrent.duration.{FiniteDuration, _} diff --git a/common/src/main/scala/services/local/support/HackClearActor.scala b/common/src/main/scala/services/local/support/HackClearActor.scala index f1c9f6e1..a53becd8 100644 --- a/common/src/main/scala/services/local/support/HackClearActor.scala +++ b/common/src/main/scala/services/local/support/HackClearActor.scala @@ -8,7 +8,7 @@ import net.psforever.objects.DefaultCancellable import net.psforever.objects.serverobject.hackable.Hackable import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import scala.annotation.tailrec import scala.concurrent.duration._ diff --git a/common/src/main/scala/services/teamwork/SquadServiceMessage.scala b/common/src/main/scala/services/teamwork/SquadServiceMessage.scala index fd856ae0..acff70e5 100644 --- a/common/src/main/scala/services/teamwork/SquadServiceMessage.scala +++ b/common/src/main/scala/services/teamwork/SquadServiceMessage.scala @@ -3,8 +3,8 @@ package services.teamwork import net.psforever.objects.Player import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{PlanetSideGUID, SquadAction => PacketSquadAction, WaypointEventAction, WaypointInfo} -import net.psforever.types.{SquadRequestType, SquadWaypoints, Vector3} +import net.psforever.packet.game.{WaypointEventAction, WaypointInfo, SquadAction => PacketSquadAction} +import net.psforever.types.{PlanetSideGUID, SquadRequestType, SquadWaypoints, Vector3} final case class SquadServiceMessage(tplayer : Player, zone : Zone, actionMessage : Any) diff --git a/common/src/main/scala/services/teamwork/SquadServiceResponse.scala b/common/src/main/scala/services/teamwork/SquadServiceResponse.scala index 82fd1339..992905a6 100644 --- a/common/src/main/scala/services/teamwork/SquadServiceResponse.scala +++ b/common/src/main/scala/services/teamwork/SquadServiceResponse.scala @@ -3,7 +3,7 @@ package services.teamwork import net.psforever.objects.teamwork.Squad import net.psforever.packet.game._ -import net.psforever.types.{SquadResponseType, SquadWaypoints} +import net.psforever.types.{PlanetSideGUID, SquadResponseType, SquadWaypoints} import services.GenericEventBusMsg final case class SquadServiceResponse(toChannel : String, exclude : Iterable[Long], response : SquadResponse.Response) extends GenericEventBusMsg diff --git a/common/src/main/scala/services/vehicle/VehicleService.scala b/common/src/main/scala/services/vehicle/VehicleService.scala index 418c7f15..e4a220fb 100644 --- a/common/src/main/scala/services/vehicle/VehicleService.scala +++ b/common/src/main/scala/services/vehicle/VehicleService.scala @@ -9,10 +9,10 @@ import net.psforever.objects.serverobject.terminals.{MedicalTerminalDefinition, import net.psforever.objects.vehicles.{Utility, UtilityType} import net.psforever.objects.vital.RepairFromTerm import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent import services.vehicle.support.{TurretUpgrader, VehicleRemover} -import net.psforever.types.DriveState +import net.psforever.types.{DriveState, PlanetSideGUID} import services.local.LocalServiceMessage import services.{GenericEventBus, RemoverActor, Service} diff --git a/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala b/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala index 1c13cdea..cd8d89dc 100644 --- a/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala +++ b/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala @@ -5,9 +5,8 @@ import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.equipment.Equipment import net.psforever.objects.zones.Zone import net.psforever.packet.PlanetSideGamePacket -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.ConstructorData -import net.psforever.types.{BailType, DriveState, Vector3} +import net.psforever.types.{BailType, DriveState, PlanetSideGUID, Vector3} final case class VehicleServiceMessage(forChannel : String, actionMessage : VehicleAction.Action) diff --git a/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala b/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala index a87fe68a..515d0091 100644 --- a/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala +++ b/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala @@ -7,8 +7,8 @@ import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.packet.PlanetSideGamePacket import net.psforever.packet.game.objectcreate.ConstructorData -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} -import net.psforever.types.{BailType, DriveState, Vector3} +import net.psforever.packet.game.ObjectCreateMessage +import net.psforever.types.{BailType, DriveState, PlanetSideGUID, Vector3} import services.GenericEventBusMsg final case class VehicleServiceResponse(toChannel : String, diff --git a/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala b/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala index 46e2ba6a..b80aaf17 100644 --- a/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala +++ b/common/src/main/scala/services/vehicle/support/TurretUpgrader.scala @@ -7,7 +7,7 @@ import net.psforever.objects.guid.{GUIDTask, Task, TaskResolver} import net.psforever.objects.serverobject.turret.{FacilityTurret, TurretUpgrade} import net.psforever.objects.vehicles.MountedWeapons import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.support.{SimilarityComparator, SupportActor, SupportActorCaseConversions} import services.vehicle.{VehicleAction, VehicleServiceMessage} import services.{Service, ServiceManager} diff --git a/common/src/main/scala/services/vehicle/support/VehicleRemover.scala b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala index 4e45c037..17c7584b 100644 --- a/common/src/main/scala/services/vehicle/support/VehicleRemover.scala +++ b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala @@ -4,8 +4,7 @@ package services.vehicle.support import net.psforever.objects.Vehicle import net.psforever.objects.guid.{GUIDTask, TaskResolver} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.DriveState +import net.psforever.types.{DriveState, PlanetSideGUID} import services.{RemoverActor, Service} import services.vehicle.{VehicleAction, VehicleServiceMessage} diff --git a/common/src/test/scala/control/MultiPacketCollectorTest.scala b/common/src/test/scala/control/MultiPacketCollectorTest.scala index 38d7e9f9..bf850a9d 100644 --- a/common/src/test/scala/control/MultiPacketCollectorTest.scala +++ b/common/src/test/scala/control/MultiPacketCollectorTest.scala @@ -4,7 +4,8 @@ package control import org.specs2.mutable._ import net.psforever.packet.control.{ControlSync, MultiPacketBundle, MultiPacketCollector} import net.psforever.packet.crypto.{ClientFinished, ServerFinished} -import net.psforever.packet.game.{ObjectDeleteMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectDeleteMessage +import net.psforever.types.PlanetSideGUID class MultiPacketCollectorTest extends Specification { val packet1 = ObjectDeleteMessage(PlanetSideGUID(1103), 2) diff --git a/common/src/test/scala/game/ActionCancelMessageTest.scala b/common/src/test/scala/game/ActionCancelMessageTest.scala index 2c8ee068..1909148f 100644 --- a/common/src/test/scala/game/ActionCancelMessageTest.scala +++ b/common/src/test/scala/game/ActionCancelMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ActionCancelMessageTest extends Specification { diff --git a/common/src/test/scala/game/ArmorChangedMessageTest.scala b/common/src/test/scala/game/ArmorChangedMessageTest.scala index e587e1f8..ce2e57ce 100644 --- a/common/src/test/scala/game/ArmorChangedMessageTest.scala +++ b/common/src/test/scala/game/ArmorChangedMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.ExoSuitType +import net.psforever.types.{ExoSuitType, PlanetSideGUID} import scodec.bits._ class ArmorChangedMessageTest extends Specification { diff --git a/common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala b/common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala index 2425c021..735a9ff1 100644 --- a/common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala +++ b/common/src/test/scala/game/AvatarFirstTimeEventMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class AvatarFirstTimeEventMessageTest extends Specification { diff --git a/common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala b/common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala index a153af90..67bbc1f5 100644 --- a/common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala +++ b/common/src/test/scala/game/AvatarGrenadeStateMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.GrenadeState +import net.psforever.types.{GrenadeState, PlanetSideGUID} import scodec.bits._ class AvatarGrenadeStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/AvatarImplantMessageTest.scala b/common/src/test/scala/game/AvatarImplantMessageTest.scala index 78b26960..3591f6fd 100644 --- a/common/src/test/scala/game/AvatarImplantMessageTest.scala +++ b/common/src/test/scala/game/AvatarImplantMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class AvatarImplantMessageTest extends Specification { diff --git a/common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala b/common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala index d0175d06..5efbf700 100644 --- a/common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala +++ b/common/src/test/scala/game/AvatarSearchCriteriaMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class AvatarSearchCriteriaMessageTest extends Specification { diff --git a/common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala b/common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala index 633f29b4..db489dfa 100644 --- a/common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala +++ b/common/src/test/scala/game/AvatarVehicleTimerMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class AvatarVehicleTimerMessageTest extends Specification { diff --git a/common/src/test/scala/game/BattleExperienceMessageTest.scala b/common/src/test/scala/game/BattleExperienceMessageTest.scala index d47e0144..3df06013 100644 --- a/common/src/test/scala/game/BattleExperienceMessageTest.scala +++ b/common/src/test/scala/game/BattleExperienceMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class BattleExperienceMessageTest extends Specification { diff --git a/common/src/test/scala/game/ChangeAmmoMessageTest.scala b/common/src/test/scala/game/ChangeAmmoMessageTest.scala index cd066fc9..f0a1a326 100644 --- a/common/src/test/scala/game/ChangeAmmoMessageTest.scala +++ b/common/src/test/scala/game/ChangeAmmoMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChangeAmmoMessageTest extends Specification { diff --git a/common/src/test/scala/game/ChangeFireModeMessageTest.scala b/common/src/test/scala/game/ChangeFireModeMessageTest.scala index 18110e9d..3e6ad42c 100644 --- a/common/src/test/scala/game/ChangeFireModeMessageTest.scala +++ b/common/src/test/scala/game/ChangeFireModeMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChangeFireModeMessageTest extends Specification { diff --git a/common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala b/common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala index fffdf708..7e48724a 100644 --- a/common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala +++ b/common/src/test/scala/game/ChangeFireStateMessage_StartTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChangeFireStateMessage_StartTest extends Specification { diff --git a/common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala b/common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala index 83ee1a20..60855678 100644 --- a/common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala +++ b/common/src/test/scala/game/ChangeFireStateMessage_StopTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChangeFireStateMessage_StopTest extends Specification { diff --git a/common/src/test/scala/game/ChangeShortcutBankMessageTest.scala b/common/src/test/scala/game/ChangeShortcutBankMessageTest.scala index 2f140eb1..1cd4fbed 100644 --- a/common/src/test/scala/game/ChangeShortcutBankMessageTest.scala +++ b/common/src/test/scala/game/ChangeShortcutBankMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChangeShortcutBankMessageTest extends Specification { diff --git a/common/src/test/scala/game/CharacterInfoMessageTest.scala b/common/src/test/scala/game/CharacterInfoMessageTest.scala index 0d03c687..44a8a7a4 100644 --- a/common/src/test/scala/game/CharacterInfoMessageTest.scala +++ b/common/src/test/scala/game/CharacterInfoMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class CharacterInfoMessageTest extends Specification { diff --git a/common/src/test/scala/game/CharacterKnowledgeMessageTest.scala b/common/src/test/scala/game/CharacterKnowledgeMessageTest.scala index 37ba5ad0..09f900ec 100644 --- a/common/src/test/scala/game/CharacterKnowledgeMessageTest.scala +++ b/common/src/test/scala/game/CharacterKnowledgeMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scodec.bits._ class CharacterKnowledgeMessageTest extends Specification { diff --git a/common/src/test/scala/game/ChildObjectStateMessageTest.scala b/common/src/test/scala/game/ChildObjectStateMessageTest.scala index 12bb83e8..ccd93013 100644 --- a/common/src/test/scala/game/ChildObjectStateMessageTest.scala +++ b/common/src/test/scala/game/ChildObjectStateMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ChildObjectStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/CreateShortcutMessageTest.scala b/common/src/test/scala/game/CreateShortcutMessageTest.scala index 7e3a54e6..f5a662bf 100644 --- a/common/src/test/scala/game/CreateShortcutMessageTest.scala +++ b/common/src/test/scala/game/CreateShortcutMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class CreateShortcutMessageTest extends Specification { diff --git a/common/src/test/scala/game/DamageFeedbackMessageTest.scala b/common/src/test/scala/game/DamageFeedbackMessageTest.scala index 983a6f7d..d5678537 100644 --- a/common/src/test/scala/game/DamageFeedbackMessageTest.scala +++ b/common/src/test/scala/game/DamageFeedbackMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DamageFeedbackMessageTest extends Specification { diff --git a/common/src/test/scala/game/DamageMessageTest.scala b/common/src/test/scala/game/DamageMessageTest.scala index 1eb44a33..ed8dcf3c 100644 --- a/common/src/test/scala/game/DamageMessageTest.scala +++ b/common/src/test/scala/game/DamageMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DamageMessageTest extends Specification { diff --git a/common/src/test/scala/game/DelayedPathMountMsgTest.scala b/common/src/test/scala/game/DelayedPathMountMsgTest.scala index 14bc82bb..b7dcc6c2 100644 --- a/common/src/test/scala/game/DelayedPathMountMsgTest.scala +++ b/common/src/test/scala/game/DelayedPathMountMsgTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DelayedPathMountMsgTest extends Specification { diff --git a/common/src/test/scala/game/DeployObjectMessageTest.scala b/common/src/test/scala/game/DeployObjectMessageTest.scala index 99d89180..418bda35 100644 --- a/common/src/test/scala/game/DeployObjectMessageTest.scala +++ b/common/src/test/scala/game/DeployObjectMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class DeployObjectMessageTest extends Specification { diff --git a/common/src/test/scala/game/DeployRequestMessageTest.scala b/common/src/test/scala/game/DeployRequestMessageTest.scala index 69139812..e928e3d6 100644 --- a/common/src/test/scala/game/DeployRequestMessageTest.scala +++ b/common/src/test/scala/game/DeployRequestMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.{DriveState, Vector3} +import net.psforever.types.{DriveState, PlanetSideGUID, Vector3} import scodec.bits._ class DeployRequestMessageTest extends Specification { diff --git a/common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala b/common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala index fc2f3f3c..554a9696 100644 --- a/common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala +++ b/common/src/test/scala/game/DeployableObjectsInfoMessageTest.scala @@ -3,8 +3,8 @@ package game import org.specs2.mutable._ import net.psforever.packet._ -import net.psforever.packet.game.{PlanetSideGUID, DeploymentAction, DeployableIcon, DeployableInfo, DeployableObjectsInfoMessage} -import net.psforever.types.Vector3 +import net.psforever.packet.game.{DeployableIcon, DeployableInfo, DeployableObjectsInfoMessage, DeploymentAction} +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class DeployableObjectsInfoMessageTest extends Specification { diff --git a/common/src/test/scala/game/DestroyMessageTest.scala b/common/src/test/scala/game/DestroyMessageTest.scala index ac5314ae..877b9fa9 100644 --- a/common/src/test/scala/game/DestroyMessageTest.scala +++ b/common/src/test/scala/game/DestroyMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class DestroyMessageTest extends Specification { diff --git a/common/src/test/scala/game/DismountBuildingMsgTest.scala b/common/src/test/scala/game/DismountBuildingMsgTest.scala index 0a432ad2..44932732 100644 --- a/common/src/test/scala/game/DismountBuildingMsgTest.scala +++ b/common/src/test/scala/game/DismountBuildingMsgTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DismountBuildingMsgTest extends Specification { diff --git a/common/src/test/scala/game/DismountVehicleMsgTest.scala b/common/src/test/scala/game/DismountVehicleMsgTest.scala index f5851bbe..74b8e286 100644 --- a/common/src/test/scala/game/DismountVehicleMsgTest.scala +++ b/common/src/test/scala/game/DismountVehicleMsgTest.scala @@ -5,7 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ import scodec.bits._ -import net.psforever.types.BailType +import net.psforever.types.{BailType, PlanetSideGUID} class DismountVehicleMsgTest extends Specification { val string = hex"0F C609 00" diff --git a/common/src/test/scala/game/DisplayedAwardMessageTest.scala b/common/src/test/scala/game/DisplayedAwardMessageTest.scala index cbe6d565..3b848fad 100644 --- a/common/src/test/scala/game/DisplayedAwardMessageTest.scala +++ b/common/src/test/scala/game/DisplayedAwardMessageTest.scala @@ -1,7 +1,7 @@ // Copyright (c) 2017 PSForever package game -import net.psforever.types.MeritCommendation +import net.psforever.types.{MeritCommendation, PlanetSideGUID} import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ diff --git a/common/src/test/scala/game/DropItemMessageTest.scala b/common/src/test/scala/game/DropItemMessageTest.scala index 961cb8c7..05fd0cf4 100644 --- a/common/src/test/scala/game/DropItemMessageTest.scala +++ b/common/src/test/scala/game/DropItemMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DropItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/EmoteMsgTest.scala b/common/src/test/scala/game/EmoteMsgTest.scala index 9f1a8549..a9f69485 100644 --- a/common/src/test/scala/game/EmoteMsgTest.scala +++ b/common/src/test/scala/game/EmoteMsgTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.EmoteType +import net.psforever.types.{EmoteType, PlanetSideGUID} import scodec.bits._ class EmoteMsgTest extends Specification { diff --git a/common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala b/common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala index 71b885c0..3f21c215 100644 --- a/common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala +++ b/common/src/test/scala/game/FacilityBenefitShieldChargeRequestMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class FacilityBenefitShieldChargeRequestMessageTest extends Specification { diff --git a/common/src/test/scala/game/FavoritesMessageTest.scala b/common/src/test/scala/game/FavoritesMessageTest.scala index 660d088d..8971408c 100644 --- a/common/src/test/scala/game/FavoritesMessageTest.scala +++ b/common/src/test/scala/game/FavoritesMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.LoadoutType +import net.psforever.types.{LoadoutType, PlanetSideGUID} import scodec.bits._ class FavoritesMessageTest extends Specification { diff --git a/common/src/test/scala/game/FavoritesRequestTest.scala b/common/src/test/scala/game/FavoritesRequestTest.scala index ca66f047..951c45ab 100644 --- a/common/src/test/scala/game/FavoritesRequestTest.scala +++ b/common/src/test/scala/game/FavoritesRequestTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.LoadoutType +import net.psforever.types.{LoadoutType, PlanetSideGUID} import scodec.bits._ class FavoritesRequestTest extends Specification { diff --git a/common/src/test/scala/game/FireHintMessageTest.scala b/common/src/test/scala/game/FireHintMessageTest.scala index 9893694c..d5c8c891 100644 --- a/common/src/test/scala/game/FireHintMessageTest.scala +++ b/common/src/test/scala/game/FireHintMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class FireHintMessageTest extends Specification { diff --git a/common/src/test/scala/game/GenericCollisionMsgTest.scala b/common/src/test/scala/game/GenericCollisionMsgTest.scala index b455bb61..94571737 100644 --- a/common/src/test/scala/game/GenericCollisionMsgTest.scala +++ b/common/src/test/scala/game/GenericCollisionMsgTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class GenericCollisionMsgTest extends Specification { diff --git a/common/src/test/scala/game/GenericObjectActionMessageTest.scala b/common/src/test/scala/game/GenericObjectActionMessageTest.scala index d0298777..cf9970f5 100644 --- a/common/src/test/scala/game/GenericObjectActionMessageTest.scala +++ b/common/src/test/scala/game/GenericObjectActionMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class GenericObjectActionMessageTest extends Specification { diff --git a/common/src/test/scala/game/GenericObjectStateMsgTest.scala b/common/src/test/scala/game/GenericObjectStateMsgTest.scala index b7f22b93..1ba55af8 100644 --- a/common/src/test/scala/game/GenericObjectStateMsgTest.scala +++ b/common/src/test/scala/game/GenericObjectStateMsgTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class GenericObjectStateMsgTest extends Specification { diff --git a/common/src/test/scala/game/HackMessageTest.scala b/common/src/test/scala/game/HackMessageTest.scala index 469950d1..e16863d7 100644 --- a/common/src/test/scala/game/HackMessageTest.scala +++ b/common/src/test/scala/game/HackMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class HackMessageTest extends Specification { diff --git a/common/src/test/scala/game/HitHintTest.scala b/common/src/test/scala/game/HitHintTest.scala index 804c55b9..4721588f 100644 --- a/common/src/test/scala/game/HitHintTest.scala +++ b/common/src/test/scala/game/HitHintTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class HitHintTest extends Specification { diff --git a/common/src/test/scala/game/HitMessageTest.scala b/common/src/test/scala/game/HitMessageTest.scala index 67ae0a01..8dd9cac8 100644 --- a/common/src/test/scala/game/HitMessageTest.scala +++ b/common/src/test/scala/game/HitMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class HitMessageTest extends Specification { diff --git a/common/src/test/scala/game/InventoryStateMessageTest.scala b/common/src/test/scala/game/InventoryStateMessageTest.scala index 9b0cddfa..d11f5372 100644 --- a/common/src/test/scala/game/InventoryStateMessageTest.scala +++ b/common/src/test/scala/game/InventoryStateMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class InventoryStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/ItemTransactionMessageTest.scala b/common/src/test/scala/game/ItemTransactionMessageTest.scala index 0b5c7b83..8574cc96 100644 --- a/common/src/test/scala/game/ItemTransactionMessageTest.scala +++ b/common/src/test/scala/game/ItemTransactionMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.TransactionType +import net.psforever.types.{PlanetSideGUID, TransactionType} import scodec.bits._ class ItemTransactionMessageTest extends Specification { diff --git a/common/src/test/scala/game/ItemTransactionResultMessageTest.scala b/common/src/test/scala/game/ItemTransactionResultMessageTest.scala index 7b13e7cb..4a49c551 100644 --- a/common/src/test/scala/game/ItemTransactionResultMessageTest.scala +++ b/common/src/test/scala/game/ItemTransactionResultMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.TransactionType +import net.psforever.types.{PlanetSideGUID, TransactionType} import scodec.bits._ class ItemTransactionResultMessageTest extends Specification { diff --git a/common/src/test/scala/game/LashMessageTest.scala b/common/src/test/scala/game/LashMessageTest.scala index f8bb6ac4..2e43143e 100644 --- a/common/src/test/scala/game/LashMessageTest.scala +++ b/common/src/test/scala/game/LashMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class LashMessageTest extends Specification { diff --git a/common/src/test/scala/game/LootItemMessageTest.scala b/common/src/test/scala/game/LootItemMessageTest.scala index ee9d1425..d28b086a 100644 --- a/common/src/test/scala/game/LootItemMessageTest.scala +++ b/common/src/test/scala/game/LootItemMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class LootItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/MountVehicleMsgTest.scala b/common/src/test/scala/game/MountVehicleMsgTest.scala index 3d7c69f5..43e1ed43 100644 --- a/common/src/test/scala/game/MountVehicleMsgTest.scala +++ b/common/src/test/scala/game/MountVehicleMsgTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class MountVehicleMsgTest extends Specification { diff --git a/common/src/test/scala/game/MoveItemMessageTest.scala b/common/src/test/scala/game/MoveItemMessageTest.scala index 01316421..4b893f9e 100644 --- a/common/src/test/scala/game/MoveItemMessageTest.scala +++ b/common/src/test/scala/game/MoveItemMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class MoveItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/ObjectAttachMessageTest.scala b/common/src/test/scala/game/ObjectAttachMessageTest.scala index a3b14f80..e025cd3e 100644 --- a/common/src/test/scala/game/ObjectAttachMessageTest.scala +++ b/common/src/test/scala/game/ObjectAttachMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ObjectAttachMessageTest extends Specification { diff --git a/common/src/test/scala/game/ObjectDeleteMessageTest.scala b/common/src/test/scala/game/ObjectDeleteMessageTest.scala index a83f2d78..9ebf6668 100644 --- a/common/src/test/scala/game/ObjectDeleteMessageTest.scala +++ b/common/src/test/scala/game/ObjectDeleteMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ObjectDeleteMessageTest extends Specification { diff --git a/common/src/test/scala/game/ObjectDetachMessageTest.scala b/common/src/test/scala/game/ObjectDetachMessageTest.scala index a5266513..2e2847dd 100644 --- a/common/src/test/scala/game/ObjectDetachMessageTest.scala +++ b/common/src/test/scala/game/ObjectDetachMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class ObjectDetachMessageTest extends Specification { diff --git a/common/src/test/scala/game/ObjectDetectedMessageTest.scala b/common/src/test/scala/game/ObjectDetectedMessageTest.scala index 159e86a6..5e4de790 100644 --- a/common/src/test/scala/game/ObjectDetectedMessageTest.scala +++ b/common/src/test/scala/game/ObjectDetectedMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ObjectDetectedMessageTest extends Specification { diff --git a/common/src/test/scala/game/ObjectHeldMessageTest.scala b/common/src/test/scala/game/ObjectHeldMessageTest.scala index 2104c104..c3cb43aa 100644 --- a/common/src/test/scala/game/ObjectHeldMessageTest.scala +++ b/common/src/test/scala/game/ObjectHeldMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ObjectHeldMessageTest extends Specification { diff --git a/common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala b/common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala index c6f9c1b9..59f36c3b 100644 --- a/common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala +++ b/common/src/test/scala/game/OrbitalStrikeWaypointMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class OrbitalStrikeWaypointMessageTest extends Specification { diff --git a/common/src/test/scala/game/OxygenStateMessageTest.scala b/common/src/test/scala/game/OxygenStateMessageTest.scala index 034be18e..6631ef0a 100644 --- a/common/src/test/scala/game/OxygenStateMessageTest.scala +++ b/common/src/test/scala/game/OxygenStateMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class OxygenStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/PickupItemMessageTest.scala b/common/src/test/scala/game/PickupItemMessageTest.scala index 34a10360..63ee2ed4 100644 --- a/common/src/test/scala/game/PickupItemMessageTest.scala +++ b/common/src/test/scala/game/PickupItemMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class PickupItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/PlanetsideAttributeMessageTest.scala b/common/src/test/scala/game/PlanetsideAttributeMessageTest.scala index 0706bfa7..c512bdee 100644 --- a/common/src/test/scala/game/PlanetsideAttributeMessageTest.scala +++ b/common/src/test/scala/game/PlanetsideAttributeMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable.Specification import net.psforever.packet.PacketCoding import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class PlanetsideAttributeMessageTest extends Specification { diff --git a/common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala b/common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala index 41e6d5c9..e02532eb 100644 --- a/common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala +++ b/common/src/test/scala/game/PlanetsideStringAttributeMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable.Specification import net.psforever.packet.PacketCoding import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class PlanetsideStringAttributeMessageTest extends Specification { diff --git a/common/src/test/scala/game/PlayerStasisMessageTest.scala b/common/src/test/scala/game/PlayerStasisMessageTest.scala index c7f24c47..9c730208 100644 --- a/common/src/test/scala/game/PlayerStasisMessageTest.scala +++ b/common/src/test/scala/game/PlayerStasisMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class PlayerStasisMessageTest extends Specification { diff --git a/common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala b/common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala index e1ab4ba3..8dcd4d33 100644 --- a/common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala +++ b/common/src/test/scala/game/PlayerStateMessageUpstreamTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class PlayerStateMessageUpstreamTest extends Specification { diff --git a/common/src/test/scala/game/ProjectileStateMessageTest.scala b/common/src/test/scala/game/ProjectileStateMessageTest.scala index b8ff8f84..3794e093 100644 --- a/common/src/test/scala/game/ProjectileStateMessageTest.scala +++ b/common/src/test/scala/game/ProjectileStateMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class ProjectileStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/ProximityTerminalUseMessageTest.scala b/common/src/test/scala/game/ProximityTerminalUseMessageTest.scala index 09d7627b..80ee2791 100644 --- a/common/src/test/scala/game/ProximityTerminalUseMessageTest.scala +++ b/common/src/test/scala/game/ProximityTerminalUseMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ProximityTerminalUseMessageTest extends Specification { diff --git a/common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala b/common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala index 2d4c2790..3e8e8139 100644 --- a/common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala +++ b/common/src/test/scala/game/QuantityDeltaUpdateMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class QuantityDeltaUpdateMessageTest extends Specification { diff --git a/common/src/test/scala/game/QuantityUpdateMessageTest.scala b/common/src/test/scala/game/QuantityUpdateMessageTest.scala index 6e9dea7c..7997acb5 100644 --- a/common/src/test/scala/game/QuantityUpdateMessageTest.scala +++ b/common/src/test/scala/game/QuantityUpdateMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class QuantityUpdateMessageTest extends Specification { diff --git a/common/src/test/scala/game/ReloadMessageTest.scala b/common/src/test/scala/game/ReloadMessageTest.scala index 73c6f8d7..b2fda764 100644 --- a/common/src/test/scala/game/ReloadMessageTest.scala +++ b/common/src/test/scala/game/ReloadMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ReloadMessageTest extends Specification { diff --git a/common/src/test/scala/game/RepairMessageTest.scala b/common/src/test/scala/game/RepairMessageTest.scala index 3e4eaf06..bbff8cd8 100644 --- a/common/src/test/scala/game/RepairMessageTest.scala +++ b/common/src/test/scala/game/RepairMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class RepairMessageTest extends Specification { diff --git a/common/src/test/scala/game/ReplicationStreamMessageTest.scala b/common/src/test/scala/game/ReplicationStreamMessageTest.scala index 2d39a2a6..057a0abf 100644 --- a/common/src/test/scala/game/ReplicationStreamMessageTest.scala +++ b/common/src/test/scala/game/ReplicationStreamMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class ReplicationStreamMessageTest extends Specification { diff --git a/common/src/test/scala/game/RequestDestroyMessageTest.scala b/common/src/test/scala/game/RequestDestroyMessageTest.scala index 15a63bd6..e3390601 100644 --- a/common/src/test/scala/game/RequestDestroyMessageTest.scala +++ b/common/src/test/scala/game/RequestDestroyMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class RequestDestroyMessageTest extends Specification { diff --git a/common/src/test/scala/game/SetEmpireMessageTest.scala b/common/src/test/scala/game/SetEmpireMessageTest.scala index 70913b96..abcdf937 100644 --- a/common/src/test/scala/game/SetEmpireMessageTest.scala +++ b/common/src/test/scala/game/SetEmpireMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.bits._ class SetEmpireMessageTest extends Specification { diff --git a/common/src/test/scala/game/SplashHitMessageTest.scala b/common/src/test/scala/game/SplashHitMessageTest.scala index e70067af..b55390b0 100644 --- a/common/src/test/scala/game/SplashHitMessageTest.scala +++ b/common/src/test/scala/game/SplashHitMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class SplashHitMessageTest extends Specification { diff --git a/common/src/test/scala/game/SquadDefinitionActionMessageTest.scala b/common/src/test/scala/game/SquadDefinitionActionMessageTest.scala index 3ef29577..db3f1242 100644 --- a/common/src/test/scala/game/SquadDefinitionActionMessageTest.scala +++ b/common/src/test/scala/game/SquadDefinitionActionMessageTest.scala @@ -5,7 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game.SquadAction._ import net.psforever.packet.game._ -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import scodec.bits._ class SquadDefinitionActionMessageTest extends Specification { diff --git a/common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala b/common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala index 9e3fd2c1..8bdb7603 100644 --- a/common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala +++ b/common/src/test/scala/game/SquadDetailDefinitionUpdateMessageTest.scala @@ -3,7 +3,7 @@ package game import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/SquadStateTest.scala b/common/src/test/scala/game/SquadStateTest.scala index 5cce7ae3..b7fb925c 100644 --- a/common/src/test/scala/game/SquadStateTest.scala +++ b/common/src/test/scala/game/SquadStateTest.scala @@ -3,7 +3,7 @@ package game import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/TargetingImplantRequestTest.scala b/common/src/test/scala/game/TargetingImplantRequestTest.scala index 0a2112c1..6832b444 100644 --- a/common/src/test/scala/game/TargetingImplantRequestTest.scala +++ b/common/src/test/scala/game/TargetingImplantRequestTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class TargetingImplantRequestTest extends Specification { diff --git a/common/src/test/scala/game/TargetingInfoMessageTest.scala b/common/src/test/scala/game/TargetingInfoMessageTest.scala index ed62f066..827adcdc 100644 --- a/common/src/test/scala/game/TargetingInfoMessageTest.scala +++ b/common/src/test/scala/game/TargetingInfoMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class TargetingInfoMessageTest extends Specification { diff --git a/common/src/test/scala/game/TrainingZoneMessageTest.scala b/common/src/test/scala/game/TrainingZoneMessageTest.scala index dc60a770..28db6678 100644 --- a/common/src/test/scala/game/TrainingZoneMessageTest.scala +++ b/common/src/test/scala/game/TrainingZoneMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class TrainingZoneMessageTest extends Specification { diff --git a/common/src/test/scala/game/TriggerEffectMessageTest.scala b/common/src/test/scala/game/TriggerEffectMessageTest.scala index 2acc8e3c..a26a7cf9 100644 --- a/common/src/test/scala/game/TriggerEffectMessageTest.scala +++ b/common/src/test/scala/game/TriggerEffectMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class TriggerEffectMessageTest extends Specification { diff --git a/common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala b/common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala index 5cba3a14..ca2ed3df 100644 --- a/common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala +++ b/common/src/test/scala/game/TriggerEnvironmentalDamageMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class TriggerEnvironmentalDamageMessageTest extends Specification { diff --git a/common/src/test/scala/game/UnuseItemMessageTest.scala b/common/src/test/scala/game/UnuseItemMessageTest.scala index c4b08213..2c743372 100644 --- a/common/src/test/scala/game/UnuseItemMessageTest.scala +++ b/common/src/test/scala/game/UnuseItemMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class UnuseItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/UseItemMessageTest.scala b/common/src/test/scala/game/UseItemMessageTest.scala index 10c469a5..091b5135 100644 --- a/common/src/test/scala/game/UseItemMessageTest.scala +++ b/common/src/test/scala/game/UseItemMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class UseItemMessageTest extends Specification { diff --git a/common/src/test/scala/game/VehicleStateMessageTest.scala b/common/src/test/scala/game/VehicleStateMessageTest.scala index 1903fee9..e3df9ace 100644 --- a/common/src/test/scala/game/VehicleStateMessageTest.scala +++ b/common/src/test/scala/game/VehicleStateMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class VehicleStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/VehicleSubStateMessageTest.scala b/common/src/test/scala/game/VehicleSubStateMessageTest.scala index 95b0e948..4059c2c7 100644 --- a/common/src/test/scala/game/VehicleSubStateMessageTest.scala +++ b/common/src/test/scala/game/VehicleSubStateMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class VehicleSubStateMessageTest extends Specification { diff --git a/common/src/test/scala/game/VoiceHostInfoTest.scala b/common/src/test/scala/game/VoiceHostInfoTest.scala index 7272815d..7cd25bf0 100644 --- a/common/src/test/scala/game/VoiceHostInfoTest.scala +++ b/common/src/test/scala/game/VoiceHostInfoTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class VoiceHostInfoTest extends Specification { diff --git a/common/src/test/scala/game/VoiceHostRequestTest.scala b/common/src/test/scala/game/VoiceHostRequestTest.scala index 2e5b5690..91b65d97 100644 --- a/common/src/test/scala/game/VoiceHostRequestTest.scala +++ b/common/src/test/scala/game/VoiceHostRequestTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class VoiceHostRequestTest extends Specification { diff --git a/common/src/test/scala/game/WarpgateRequestTest.scala b/common/src/test/scala/game/WarpgateRequestTest.scala index d69c0004..3eb21b8f 100644 --- a/common/src/test/scala/game/WarpgateRequestTest.scala +++ b/common/src/test/scala/game/WarpgateRequestTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class WarpgateRequestTest extends Specification { diff --git a/common/src/test/scala/game/WeaponDelayFireMessageTest.scala b/common/src/test/scala/game/WeaponDelayFireMessageTest.scala index 6988a939..26341448 100644 --- a/common/src/test/scala/game/WeaponDelayFireMessageTest.scala +++ b/common/src/test/scala/game/WeaponDelayFireMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class WeaponDelayFireMessageTest extends Specification { diff --git a/common/src/test/scala/game/WeaponDryFireMessageTest.scala b/common/src/test/scala/game/WeaponDryFireMessageTest.scala index e3713ab3..76be093c 100644 --- a/common/src/test/scala/game/WeaponDryFireMessageTest.scala +++ b/common/src/test/scala/game/WeaponDryFireMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class WeaponDryFireMessageTest extends Specification { diff --git a/common/src/test/scala/game/WeaponFireMessageTest.scala b/common/src/test/scala/game/WeaponFireMessageTest.scala index 93c9e9c8..c1a9699d 100644 --- a/common/src/test/scala/game/WeaponFireMessageTest.scala +++ b/common/src/test/scala/game/WeaponFireMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class WeaponFireMessageTest extends Specification { diff --git a/common/src/test/scala/game/WeaponJammedMessageTest.scala b/common/src/test/scala/game/WeaponJammedMessageTest.scala index e42fc5f3..273a117a 100644 --- a/common/src/test/scala/game/WeaponJammedMessageTest.scala +++ b/common/src/test/scala/game/WeaponJammedMessageTest.scala @@ -4,6 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class WeaponJammedMessageTest extends Specification { diff --git a/common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala b/common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala index 35f3d75a..a4f1df7a 100644 --- a/common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala +++ b/common/src/test/scala/game/WeaponLazeTargetPositionMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class WeaponLazeTargetPositionMessageTest extends Specification { diff --git a/common/src/test/scala/game/ZipLineMessageTest.scala b/common/src/test/scala/game/ZipLineMessageTest.scala index 9dfacd90..25e405a6 100644 --- a/common/src/test/scala/game/ZipLineMessageTest.scala +++ b/common/src/test/scala/game/ZipLineMessageTest.scala @@ -4,7 +4,7 @@ package game import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game._ -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scodec.bits._ class ZipLineMessageTest extends Specification { diff --git a/common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala b/common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala index a2e07d99..1f8f24e5 100644 --- a/common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala +++ b/common/src/test/scala/game/objectcreate/AegisShieldGeneratorDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala b/common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala index ddd0d872..bbe7d71e 100644 --- a/common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala +++ b/common/src/test/scala/game/objectcreate/CaptureFlagDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/CharacterDataTest.scala b/common/src/test/scala/game/objectcreate/CharacterDataTest.scala index 19b51356..b43d043e 100644 --- a/common/src/test/scala/game/objectcreate/CharacterDataTest.scala +++ b/common/src/test/scala/game/objectcreate/CharacterDataTest.scala @@ -2,7 +2,7 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ import net.psforever.types._ import org.specs2.mutable._ diff --git a/common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala b/common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala index 57ba9438..c550d02c 100644 --- a/common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala +++ b/common/src/test/scala/game/objectcreate/CommonFieldDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala b/common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala index 65737f1e..5833a32c 100644 --- a/common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala +++ b/common/src/test/scala/game/objectcreate/CommonFieldDataWithPlacementTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/HandheldDataTest.scala b/common/src/test/scala/game/objectcreate/HandheldDataTest.scala index 790efb4b..837dcf25 100644 --- a/common/src/test/scala/game/objectcreate/HandheldDataTest.scala +++ b/common/src/test/scala/game/objectcreate/HandheldDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala b/common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala index f960c318..427cd68f 100644 --- a/common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala +++ b/common/src/test/scala/game/objectcreate/LockerContainerDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala b/common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala index 79e8e32e..401db007 100644 --- a/common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala +++ b/common/src/test/scala/game/objectcreate/OneMannedFieldTurretDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/REKDataTest.scala b/common/src/test/scala/game/objectcreate/REKDataTest.scala index 1f6da6b1..29c05703 100644 --- a/common/src/test/scala/game/objectcreate/REKDataTest.scala +++ b/common/src/test/scala/game/objectcreate/REKDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala b/common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala index a6cf8062..88112f05 100644 --- a/common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala +++ b/common/src/test/scala/game/objectcreate/RemoteProjectileDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala b/common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala index 929cd99d..d885404a 100644 --- a/common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala +++ b/common/src/test/scala/game/objectcreate/SmallTurretDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/TRAPDataTest.scala b/common/src/test/scala/game/objectcreate/TRAPDataTest.scala index 63c81efa..57222dd1 100644 --- a/common/src/test/scala/game/objectcreate/TRAPDataTest.scala +++ b/common/src/test/scala/game/objectcreate/TRAPDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala b/common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala index 7f342a49..4fcdf290 100644 --- a/common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala +++ b/common/src/test/scala/game/objectcreate/TelepadDeployableDataTest.scala @@ -4,7 +4,7 @@ package game.objectcreate import net.psforever.packet._ import net.psforever.packet.game._ import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreate/WeaponDataTest.scala b/common/src/test/scala/game/objectcreate/WeaponDataTest.scala index c9e504bd..61894762 100644 --- a/common/src/test/scala/game/objectcreate/WeaponDataTest.scala +++ b/common/src/test/scala/game/objectcreate/WeaponDataTest.scala @@ -2,9 +2,9 @@ package game.objectcreate import net.psforever.packet.PacketCoding -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala b/common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala index b3afa5cf..93eaf283 100644 --- a/common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala +++ b/common/src/test/scala/game/objectcreatedetailed/DetailedAmmoBoxDataTest.scala @@ -5,6 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game.{ObjectCreateDetailedMessage, _} import net.psforever.packet.game.objectcreate._ +import net.psforever.types.PlanetSideGUID import scodec.bits._ class DetailedAmmoBoxDataTest extends Specification { diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala b/common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala index f2abe55e..b0ecf1e5 100644 --- a/common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala +++ b/common/src/test/scala/game/objectcreatedetailed/DetailedCommandDetonaterDataTest.scala @@ -5,7 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game.{ObjectCreateDetailedMessage, _} import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.bits._ class DetailedCommandDetonaterDataTest extends Specification { diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala b/common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala index c4e16b0b..53e0d3f3 100644 --- a/common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala +++ b/common/src/test/scala/game/objectcreatedetailed/DetailedConstructionToolDataTest.scala @@ -4,7 +4,7 @@ package game.objectcreatedetailed import net.psforever.packet._ import net.psforever.packet.game._ import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala b/common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala index 1ee0b18b..53963f3a 100644 --- a/common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala +++ b/common/src/test/scala/game/objectcreatedetailed/DetailedREKDataTest.scala @@ -5,7 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game.{ObjectCreateDetailedMessage, _} import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.bits._ class DetailedREKDataTest extends Specification { diff --git a/common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala b/common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala index 9ad972ed..048ea3c0 100644 --- a/common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala +++ b/common/src/test/scala/game/objectcreatedetailed/DetailedWeaponDataTest.scala @@ -5,7 +5,7 @@ import org.specs2.mutable._ import net.psforever.packet._ import net.psforever.packet.game.{ObjectCreateDetailedMessage, _} import net.psforever.packet.game.objectcreate._ -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import scodec.bits._ class DetailedWeaponDataTest extends Specification { diff --git a/common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala index cc7a0055..111be72a 100644 --- a/common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/DestroyedVehiclesTest.scala @@ -3,7 +3,8 @@ package game.objectcreatevehicle import net.psforever.packet._ import net.psforever.packet.game.objectcreate._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage +import net.psforever.types.PlanetSideGUID import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala index ea206eab..ece00f39 100644 --- a/common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/MountedVehiclesTest.scala @@ -3,7 +3,7 @@ package game.objectcreatevehicle import net.psforever.packet._ import net.psforever.packet.game.objectcreate._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types._ import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala index ca0aaeec..5c191169 100644 --- a/common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/NonstandardVehiclesTest.scala @@ -3,7 +3,7 @@ package game.objectcreatevehicle import net.psforever.packet._ import net.psforever.packet.game.objectcreate._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types._ import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala index a0e38289..7695a2bb 100644 --- a/common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/NormalVehiclesTest.scala @@ -3,7 +3,7 @@ package game.objectcreatevehicle import net.psforever.packet._ import net.psforever.packet.game.objectcreate._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types._ import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala index 6ad1af20..2ae36f14 100644 --- a/common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/UtilityVehiclesTest.scala @@ -3,7 +3,7 @@ package game.objectcreatevehicle import net.psforever.packet._ import net.psforever.packet.game.objectcreate._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.types._ import org.specs2.mutable._ import scodec.bits._ diff --git a/common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala b/common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala index 672945b8..70dd9253 100644 --- a/common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala +++ b/common/src/test/scala/game/objectcreatevehicle/VariantVehiclesTest.scala @@ -2,7 +2,7 @@ package game.objectcreatevehicle import net.psforever.packet._ -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID} +import net.psforever.packet.game.ObjectCreateMessage import net.psforever.packet.game.objectcreate._ import net.psforever.types._ import org.specs2.mutable._ diff --git a/common/src/test/scala/objects/BuildingTest.scala b/common/src/test/scala/objects/BuildingTest.scala index 5ed03161..f35bc5e2 100644 --- a/common/src/test/scala/objects/BuildingTest.scala +++ b/common/src/test/scala/objects/BuildingTest.scala @@ -9,8 +9,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.doors.{Door, DoorControl} import net.psforever.objects.serverobject.structures._ import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.PlanetSideEmpire +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification import services.ServiceManager import services.galaxy.GalaxyService diff --git a/common/src/test/scala/objects/ContainerTest.scala b/common/src/test/scala/objects/ContainerTest.scala index 9d398cee..f64eb401 100644 --- a/common/src/test/scala/objects/ContainerTest.scala +++ b/common/src/test/scala/objects/ContainerTest.scala @@ -4,7 +4,7 @@ package objects import net.psforever.objects.equipment.{EquipmentSize, EquipmentSlot} import net.psforever.objects.inventory.{Container, GridInventory, InventoryEquipmentSlot} import net.psforever.objects.{GlobalDefinitions, OffhandEquipmentSlot, Tool} -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import org.specs2.mutable._ import scala.util.Success diff --git a/common/src/test/scala/objects/ConverterTest.scala b/common/src/test/scala/objects/ConverterTest.scala index 1febaac1..04a58b5f 100644 --- a/common/src/test/scala/objects/ConverterTest.scala +++ b/common/src/test/scala/objects/ConverterTest.scala @@ -9,9 +9,8 @@ import net.psforever.objects.inventory.InventoryTile import net.psforever.objects.serverobject.terminals.Terminal import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.objects.vehicles.UtilityType -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3} +import net.psforever.types._ import org.specs2.mutable.Specification import scala.util.{Failure, Success} diff --git a/common/src/test/scala/objects/DeployableTest.scala b/common/src/test/scala/objects/DeployableTest.scala index 1c299dbd..a5581f0a 100644 --- a/common/src/test/scala/objects/DeployableTest.scala +++ b/common/src/test/scala/objects/DeployableTest.scala @@ -6,8 +6,7 @@ import base.ActorTest import net.psforever.objects.ce.DeployedItem import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.{TurretDeployable, _} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire} +import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification import scala.concurrent.duration._ diff --git a/common/src/test/scala/objects/DeployableToolboxTest.scala b/common/src/test/scala/objects/DeployableToolboxTest.scala index 6edd30f8..7bfe6f38 100644 --- a/common/src/test/scala/objects/DeployableToolboxTest.scala +++ b/common/src/test/scala/objects/DeployableToolboxTest.scala @@ -4,8 +4,8 @@ package objects import net.psforever.objects._ import net.psforever.objects.avatar.DeployableToolbox import net.psforever.objects.ce.{DeployableCategory, DeployedItem} -import net.psforever.packet.game.PlanetSideGUID import net.psforever.types.CertificationType._ +import net.psforever.types.PlanetSideGUID import org.specs2.mutable.Specification class DeployableToolboxTest extends Specification { diff --git a/common/src/test/scala/objects/DoorTest.scala b/common/src/test/scala/objects/DoorTest.scala index 732ed204..2a5bc597 100644 --- a/common/src/test/scala/objects/DoorTest.scala +++ b/common/src/test/scala/objects/DoorTest.scala @@ -7,8 +7,8 @@ import net.psforever.objects.{Avatar, GlobalDefinitions, Player} import net.psforever.objects.serverobject.doors.{Door, DoorControl} import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.{PlanetSideGUID, UseItemMessage} -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3} +import net.psforever.packet.game.UseItemMessage +import net.psforever.types._ import org.specs2.mutable.Specification import scala.concurrent.duration.Duration diff --git a/common/src/test/scala/objects/EntityTest.scala b/common/src/test/scala/objects/EntityTest.scala index 9eb089fc..92d3636a 100644 --- a/common/src/test/scala/objects/EntityTest.scala +++ b/common/src/test/scala/objects/EntityTest.scala @@ -4,8 +4,7 @@ package objects import net.psforever.objects.PlanetSideGameObject import net.psforever.objects.definition.ObjectDefinition import net.psforever.objects.entity.NoGUIDException -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import org.specs2.mutable._ class EntityTest extends Specification { diff --git a/common/src/test/scala/objects/EquipmentTest.scala b/common/src/test/scala/objects/EquipmentTest.scala index ee32e62d..4979377f 100644 --- a/common/src/test/scala/objects/EquipmentTest.scala +++ b/common/src/test/scala/objects/EquipmentTest.scala @@ -7,8 +7,7 @@ import net.psforever.objects.inventory.InventoryTile import net.psforever.objects.GlobalDefinitions._ import net.psforever.objects.ce.{DeployedItem, TelepadLike} import net.psforever.objects.definition._ -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.CertificationType +import net.psforever.types.{CertificationType, PlanetSideGUID} import org.specs2.mutable._ class EquipmentTest extends Specification { diff --git a/common/src/test/scala/objects/FacilityTurretTest.scala b/common/src/test/scala/objects/FacilityTurretTest.scala index 09f73b9f..28b4c28e 100644 --- a/common/src/test/scala/objects/FacilityTurretTest.scala +++ b/common/src/test/scala/objects/FacilityTurretTest.scala @@ -9,8 +9,7 @@ import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.serverobject.turret._ import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire} +import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification import scala.collection.mutable diff --git a/common/src/test/scala/objects/IFFLockTest.scala b/common/src/test/scala/objects/IFFLockTest.scala index eb1e751c..9259cd93 100644 --- a/common/src/test/scala/objects/IFFLockTest.scala +++ b/common/src/test/scala/objects/IFFLockTest.scala @@ -8,8 +8,7 @@ import net.psforever.objects.{Avatar, GlobalDefinitions, Player} import net.psforever.objects.serverobject.locks.{IFFLock, IFFLockControl} import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3} +import net.psforever.types._ import org.specs2.mutable.Specification class IFFLockTest extends Specification { diff --git a/common/src/test/scala/objects/InventoryTest.scala b/common/src/test/scala/objects/InventoryTest.scala index 9236ff24..48b86bd3 100644 --- a/common/src/test/scala/objects/InventoryTest.scala +++ b/common/src/test/scala/objects/InventoryTest.scala @@ -5,7 +5,7 @@ import net.psforever.objects.{AmmoBox, SimpleItem} import net.psforever.objects.definition.SimpleItemDefinition import net.psforever.objects.inventory.{GridInventory, InventoryItem, InventoryTile} import net.psforever.objects.GlobalDefinitions._ -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import org.specs2.mutable._ import scala.collection.mutable.ListBuffer diff --git a/common/src/test/scala/objects/MountableTest.scala b/common/src/test/scala/objects/MountableTest.scala index 907d8bba..42248537 100644 --- a/common/src/test/scala/objects/MountableTest.scala +++ b/common/src/test/scala/objects/MountableTest.scala @@ -8,8 +8,7 @@ import net.psforever.objects.definition.{ObjectDefinition, SeatDefinition} import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior} import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.vehicles.Seat -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire} +import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID} import scala.concurrent.duration.Duration diff --git a/common/src/test/scala/objects/PlayerTest.scala b/common/src/test/scala/objects/PlayerTest.scala index 9b2e10ad..3e312562 100644 --- a/common/src/test/scala/objects/PlayerTest.scala +++ b/common/src/test/scala/objects/PlayerTest.scala @@ -5,9 +5,8 @@ import net.psforever.objects.GlobalDefinitions._ import net.psforever.objects._ import net.psforever.objects.definition.{ImplantDefinition, SimpleItemDefinition, SpecialExoSuitDefinition} import net.psforever.objects.equipment.EquipmentSize -import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.objectcreate.{Cosmetics, PersonalStyle} -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import org.specs2.mutable._ import scala.util.Success diff --git a/common/src/test/scala/objects/ProjectileTest.scala b/common/src/test/scala/objects/ProjectileTest.scala index 26d2a87c..edd14a16 100644 --- a/common/src/test/scala/objects/ProjectileTest.scala +++ b/common/src/test/scala/objects/ProjectileTest.scala @@ -6,8 +6,7 @@ import net.psforever.objects.ballistics._ import net.psforever.objects.definition.ProjectileDefinition import net.psforever.objects.serverobject.mblocker.Locker import net.psforever.objects.vital.DamageType -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import org.specs2.mutable.Specification class ProjectileTest extends Specification { diff --git a/common/src/test/scala/objects/ResourceSiloTest.scala b/common/src/test/scala/objects/ResourceSiloTest.scala index c03ae79b..d8871aab 100644 --- a/common/src/test/scala/objects/ResourceSiloTest.scala +++ b/common/src/test/scala/objects/ResourceSiloTest.scala @@ -10,8 +10,8 @@ import net.psforever.objects.{Avatar, GlobalDefinitions, Player} import net.psforever.objects.serverobject.resourcesilo.{ResourceSilo, ResourceSiloControl, ResourceSiloDefinition} import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.zones.{Zone, ZoneMap} -import net.psforever.packet.game.{PlanetSideGUID, UseItemMessage} -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3} +import net.psforever.packet.game.UseItemMessage +import net.psforever.types._ import org.specs2.mutable.Specification import services.ServiceManager import services.avatar.{AvatarAction, AvatarServiceMessage} @@ -72,7 +72,6 @@ class ResourceSiloControlStartupTest extends ActorTest { expectNoMsg(500 milliseconds) system.actorOf(Props(classOf[ResourceSiloControl], obj), "test-silo") expectNoMsg(1 seconds) - assert(true) } } } diff --git a/common/src/test/scala/objects/ServerObjectBuilderTest.scala b/common/src/test/scala/objects/ServerObjectBuilderTest.scala index d4c97f55..16801a68 100644 --- a/common/src/test/scala/objects/ServerObjectBuilderTest.scala +++ b/common/src/test/scala/objects/ServerObjectBuilderTest.scala @@ -5,12 +5,11 @@ import akka.actor.{Actor, ActorContext, Props} import base.ActorTest import net.psforever.objects.GlobalDefinitions import net.psforever.objects.guid.NumberPoolHub -import net.psforever.packet.game.PlanetSideGUID import net.psforever.objects.serverobject.ServerObjectBuilder import net.psforever.objects.serverobject.structures.{Building, FoundationBuilder, StructureType, WarpGate} import net.psforever.objects.serverobject.terminals.ProximityTerminal import net.psforever.objects.zones.Zone -import net.psforever.types.Vector3 +import net.psforever.types.{PlanetSideGUID, Vector3} import scala.concurrent.duration.Duration diff --git a/common/src/test/scala/objects/UtilityTest.scala b/common/src/test/scala/objects/UtilityTest.scala index df70ca36..ecb8d376 100644 --- a/common/src/test/scala/objects/UtilityTest.scala +++ b/common/src/test/scala/objects/UtilityTest.scala @@ -6,7 +6,7 @@ import base.ActorTest import net.psforever.objects._ import net.psforever.objects.serverobject.terminals.Terminal import net.psforever.objects.vehicles._ -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import org.specs2.mutable._ import scala.concurrent.duration.Duration diff --git a/common/src/test/scala/objects/VehicleTest.scala b/common/src/test/scala/objects/VehicleTest.scala index 66a3104d..eebf812d 100644 --- a/common/src/test/scala/objects/VehicleTest.scala +++ b/common/src/test/scala/objects/VehicleTest.scala @@ -11,8 +11,7 @@ import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.vehicles._ import net.psforever.objects.vital.{VehicleShieldCharge, Vitality} import net.psforever.objects.zones.{Zone, ZoneMap} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import org.specs2.mutable._ import services.vehicle.{VehicleAction, VehicleServiceMessage} diff --git a/common/src/test/scala/objects/ZoneTest.scala b/common/src/test/scala/objects/ZoneTest.scala index 5c03f048..6a1e5922 100644 --- a/common/src/test/scala/objects/ZoneTest.scala +++ b/common/src/test/scala/objects/ZoneTest.scala @@ -12,8 +12,7 @@ import net.psforever.objects.guid.source.LimitedNumberSource import net.psforever.objects.serverobject.terminals.Terminal import net.psforever.objects.serverobject.tube.SpawnTube import net.psforever.objects._ -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3} +import net.psforever.types._ import net.psforever.objects.serverobject.structures.{Building, FoundationBuilder, StructureType} import net.psforever.objects.zones.{Zone, ZoneActor, ZoneMap} import net.psforever.objects.Vehicle diff --git a/common/src/test/scala/objects/number/NumberPoolHubTest.scala b/common/src/test/scala/objects/number/NumberPoolHubTest.scala index 966b547a..290e59b1 100644 --- a/common/src/test/scala/objects/number/NumberPoolHubTest.scala +++ b/common/src/test/scala/objects/number/NumberPoolHubTest.scala @@ -5,7 +5,7 @@ import net.psforever.objects.entity.IdentifiableEntity import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.selector.RandomSelector import net.psforever.objects.guid.source.LimitedNumberSource -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import org.specs2.mutable.Specification import scala.util.Success diff --git a/common/src/test/scala/objects/number/NumberSourceTest.scala b/common/src/test/scala/objects/number/NumberSourceTest.scala index 132baf2e..72e44d78 100644 --- a/common/src/test/scala/objects/number/NumberSourceTest.scala +++ b/common/src/test/scala/objects/number/NumberSourceTest.scala @@ -3,7 +3,7 @@ package objects.number import net.psforever.objects.guid.AvailabilityPolicy import net.psforever.objects.guid.key.{LoanedKey, SecureKey} -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import org.specs2.mutable.Specification class NumberSourceTest extends Specification { diff --git a/common/src/test/scala/objects/number/UniqueNumberSystemTest.scala b/common/src/test/scala/objects/number/UniqueNumberSystemTest.scala index 97203814..c6f503d5 100644 --- a/common/src/test/scala/objects/number/UniqueNumberSystemTest.scala +++ b/common/src/test/scala/objects/number/UniqueNumberSystemTest.scala @@ -8,6 +8,8 @@ import net.psforever.objects.guid.NumberPoolHub import net.psforever.objects.guid.actor.{NumberPoolActor, Register, UniqueNumberSystem, Unregister} import net.psforever.objects.guid.selector.RandomSelector import net.psforever.objects.guid.source.LimitedNumberSource +import net.psforever.types +import net.psforever.types.PlanetSideGUID import scala.concurrent.duration._ import scala.util.{Failure, Success} @@ -237,7 +239,7 @@ class UniqueNumberSystemTest7 extends ActorTest() { guid.AddPool("pool3", (5001 to 6000).toList).Selector = new RandomSelector val uns = system.actorOf(Props(classOf[UniqueNumberSystem], guid, UniqueNumberSystemTest.AllocateNumberPoolActors(guid)), "uns") val testObj = new EntityTestClass() - testObj.GUID = net.psforever.packet.game.PlanetSideGUID(6001) //fake registering; number too high + testObj.GUID = types.PlanetSideGUID(6001) //fake registering; number too high assert(testObj.HasGUID) assert(src.CountUsed == 0) @@ -262,7 +264,7 @@ class UniqueNumberSystemTest8 extends ActorTest() { guid.AddPool("pool3", (5001 to 6000).toList).Selector = new RandomSelector val uns = system.actorOf(Props(classOf[UniqueNumberSystem], guid, UniqueNumberSystemTest.AllocateNumberPoolActors(guid)), "uns") val testObj = new EntityTestClass() - testObj.GUID = net.psforever.packet.game.PlanetSideGUID(3500) //fake registering + testObj.GUID = PlanetSideGUID(3500) //fake registering assert(testObj.HasGUID) assert(src.CountUsed == 0) diff --git a/common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala b/common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala index c94235f9..f44f2a7c 100644 --- a/common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala +++ b/common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala @@ -157,8 +157,7 @@ object ImplantTerminalMechTest { def SetUpAgents(faction : PlanetSideEmpire.Value)(implicit system : ActorSystem) : (Player, ImplantTerminalMech) = { import net.psforever.objects.serverobject.structures.Building import net.psforever.objects.zones.Zone - import net.psforever.packet.game.PlanetSideGUID - + import net.psforever.types.PlanetSideGUID val terminal = ImplantTerminalMech(GlobalDefinitions.implant_terminal_mech) terminal.Actor = system.actorOf(Props(classOf[ImplantTerminalMechControl], terminal), "mech") terminal.Owner = new Building("Building", building_guid = 0, map_id = 0, Zone.Nowhere, StructureType.Building, GlobalDefinitions.building) diff --git a/common/src/test/scala/objects/terminal/MatrixTerminalTest.scala b/common/src/test/scala/objects/terminal/MatrixTerminalTest.scala index b8091205..cbdcc22a 100644 --- a/common/src/test/scala/objects/terminal/MatrixTerminalTest.scala +++ b/common/src/test/scala/objects/terminal/MatrixTerminalTest.scala @@ -3,7 +3,7 @@ package objects.terminal import net.psforever.objects.serverobject.terminals.{MatrixTerminalDefinition, Terminal} import net.psforever.objects.{Avatar, GlobalDefinitions, Player, Vehicle} -import net.psforever.packet.game.{ItemTransactionMessage, PlanetSideGUID} +import net.psforever.packet.game.ItemTransactionMessage import net.psforever.types._ import org.specs2.mutable.Specification diff --git a/common/src/test/scala/objects/terminal/OrderTerminalTest.scala b/common/src/test/scala/objects/terminal/OrderTerminalTest.scala index 3cc5fd18..c54c79ad 100644 --- a/common/src/test/scala/objects/terminal/OrderTerminalTest.scala +++ b/common/src/test/scala/objects/terminal/OrderTerminalTest.scala @@ -5,7 +5,7 @@ import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.serverobject.terminals.Terminal import net.psforever.objects.zones.Zone import net.psforever.objects._ -import net.psforever.packet.game.{ItemTransactionMessage, PlanetSideGUID} +import net.psforever.packet.game.ItemTransactionMessage import net.psforever.types._ import org.specs2.mutable.Specification diff --git a/common/src/test/scala/objects/terminal/ProximityTest.scala b/common/src/test/scala/objects/terminal/ProximityTest.scala index 173e9c32..8909f1a6 100644 --- a/common/src/test/scala/objects/terminal/ProximityTest.scala +++ b/common/src/test/scala/objects/terminal/ProximityTest.scala @@ -9,8 +9,7 @@ import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.serverobject.terminals.{ProximityTerminal, ProximityTerminalControl, ProximityUnit, Terminal} import net.psforever.objects.zones.{Zone, ZoneActor, ZoneMap} import net.psforever.objects.{Avatar, GlobalDefinitions, Player} -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire} +import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, PlanetSideGUID} import org.specs2.mutable.Specification import services.Service import services.local.LocalService diff --git a/common/src/test/scala/objects/terminal/TerminalControlTest.scala b/common/src/test/scala/objects/terminal/TerminalControlTest.scala index 7dd6dff9..008e9013 100644 --- a/common/src/test/scala/objects/terminal/TerminalControlTest.scala +++ b/common/src/test/scala/objects/terminal/TerminalControlTest.scala @@ -7,7 +7,7 @@ import net.psforever.objects.serverobject.structures.{Building, StructureType} import net.psforever.objects.serverobject.terminals.{Terminal, TerminalControl, TerminalDefinition} import net.psforever.objects.zones.Zone import net.psforever.objects.{Avatar, GlobalDefinitions, Player} -import net.psforever.packet.game.{ItemTransactionMessage, PlanetSideGUID} +import net.psforever.packet.game.ItemTransactionMessage import net.psforever.types._ import scala.concurrent.duration.Duration diff --git a/common/src/test/scala/service/LocalServiceTest.scala b/common/src/test/scala/service/LocalServiceTest.scala index cf13a310..b74611be 100644 --- a/common/src/test/scala/service/LocalServiceTest.scala +++ b/common/src/test/scala/service/LocalServiceTest.scala @@ -8,7 +8,7 @@ import net.psforever.objects.serverobject.PlanetSideServerObject import net.psforever.objects.serverobject.terminals.{ProximityTerminal, Terminal} import net.psforever.objects.zones.Zone import net.psforever.packet.game._ -import net.psforever.types.{PlanetSideEmpire, Vector3} +import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3} import services.{Service, ServiceManager} import services.local._ diff --git a/common/src/test/scala/service/RemoverActorTest.scala b/common/src/test/scala/service/RemoverActorTest.scala index 1de2dc50..b82290e1 100644 --- a/common/src/test/scala/service/RemoverActorTest.scala +++ b/common/src/test/scala/service/RemoverActorTest.scala @@ -10,7 +10,7 @@ import net.psforever.objects.definition.{EquipmentDefinition, ObjectDefinition} import net.psforever.objects.equipment.Equipment import net.psforever.objects.guid.TaskResolver import net.psforever.objects.zones.{Zone, ZoneMap} -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.{RemoverActor, ServiceManager} import scala.concurrent.duration._ diff --git a/common/src/test/scala/service/RouterTelepadActivationTest.scala b/common/src/test/scala/service/RouterTelepadActivationTest.scala index 2ad331ec..fee82487 100644 --- a/common/src/test/scala/service/RouterTelepadActivationTest.scala +++ b/common/src/test/scala/service/RouterTelepadActivationTest.scala @@ -5,7 +5,7 @@ import akka.actor.Props import base.ActorTest import net.psforever.objects._ import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID +import net.psforever.types.PlanetSideGUID import services.local.support.RouterTelepadActivation import services.support.SupportActor diff --git a/common/src/test/scala/service/VehicleServiceTest.scala b/common/src/test/scala/service/VehicleServiceTest.scala index 1508d40e..94d55f7a 100644 --- a/common/src/test/scala/service/VehicleServiceTest.scala +++ b/common/src/test/scala/service/VehicleServiceTest.scala @@ -5,8 +5,7 @@ import akka.actor.Props import base.ActorTest import net.psforever.objects._ import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import services.{Service, ServiceManager} import services.vehicle._ diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index 620aa1ba..4dfa8fac 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -46,7 +46,7 @@ import net.psforever.objects.vital._ import net.psforever.objects.zones.{InterstellarCluster, Zone, ZoneHotSpotProjector} import net.psforever.packet.game.objectcreate._ import net.psforever.packet.game.{HotSpotInfo => PacketHotSpotInfo} -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import services.{RemoverActor, vehicle, _} import services.avatar.{AvatarAction, AvatarResponse, AvatarServiceMessage, AvatarServiceResponse} import services.galaxy.{GalaxyAction, GalaxyResponse, GalaxyServiceMessage, GalaxyServiceResponse} @@ -67,6 +67,7 @@ import scala.util.Success import akka.pattern.ask import net.psforever.objects.entity.{SimpleWorldEntity, WorldEntity} import net.psforever.objects.vehicles.Utility.InternalTelepad +import net.psforever.types import services.local.support.{HackCaptureActor, RouterTelepadActivation} import services.support.SupportActor @@ -409,7 +410,7 @@ class WorldSessionActor extends Actor if(!excluded.exists(_ == avatar.CharId)) { response match { case SquadResponse.ListSquadFavorite(line, task) => - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), line, SquadAction.ListSquadFavorite(task))) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), line, SquadAction.ListSquadFavorite(task))) case SquadResponse.InitList(infos) => sendResponse(ReplicationStreamMessage(infos)) @@ -511,7 +512,7 @@ class WorldSessionActor extends Actor } StopBundlingPackets() //send an initial dummy update for map icon(s) - sendResponse(SquadState(PlanetSideGUID(squad_supplement_id), + sendResponse(SquadState(types.PlanetSideGUID(squad_supplement_id), membershipPositions .filterNot { case (member, _) => member.CharId == avatar.CharId } .map{ case (member, _) => SquadStateInfo(member.CharId, member.Health, member.Armor, member.Position, 2,2, false, 429, None,None) } @@ -537,7 +538,7 @@ class WorldSessionActor extends Actor sendResponse(PlanetsideAttributeMessage(playerGuid, 34, 4294967295L)) //unknown, perhaps unrelated? lfsm = false //a finalization? what does this do? - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.Unknown(18))) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.Unknown(18))) squad_supplement_id = 0 squadUpdateCounter = 0 updateSquad = NoSquadUpdates @@ -603,7 +604,7 @@ class WorldSessionActor extends Actor if(updatedEntries.nonEmpty) { sendResponse( SquadState( - PlanetSideGUID(squad_supplement_id), + types.PlanetSideGUID(squad_supplement_id), updatedEntries.map { entry => SquadStateInfo(entry.char_id, entry.health, entry.armor, entry.pos, 2,2, false, 429, None,None)} ) ) @@ -611,7 +612,7 @@ class WorldSessionActor extends Actor case SquadResponse.SquadSearchResults() => //I don't actually know how to return search results - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.NoSquadSearchResults())) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.NoSquadSearchResults())) case SquadResponse.InitWaypoints(char_id, waypoints) => StartBundlingPackets() @@ -718,8 +719,8 @@ class WorldSessionActor extends Actor } sendResponse(CharacterInfoMessage(15, PlanetSideZoneID(10000), avatar.CharId, player.GUID, false, 6404428)) RemoveCharacterSelectScreenGUID(player) - sendResponse(CharacterInfoMessage(0, PlanetSideZoneID(1), 0, PlanetSideGUID(0), true, 0)) - sendResponse(CharacterInfoMessage(0, PlanetSideZoneID(1), 0, PlanetSideGUID(0), true, 0)) + sendResponse(CharacterInfoMessage(0, PlanetSideZoneID(1), 0, types.PlanetSideGUID(0), true, 0)) + sendResponse(CharacterInfoMessage(0, PlanetSideZoneID(1), 0, types.PlanetSideGUID(0), true, 0)) case VehicleLoaded(_ /*vehicle*/) => ; //currently being handled by VehicleSpawnPad.LoadVehicle during testing phase @@ -821,7 +822,7 @@ class WorldSessionActor extends Actor continent.LocalEvents ! LocalServiceMessage.Deployables(RemoverActor.AddTask(obj, continent)) sendResponse(SetEmpireMessage(guid, PlanetSideEmpire.NEUTRAL)) continent.AvatarEvents ! AvatarServiceMessage(factionChannel, AvatarAction.SetEmpire(playerGUID, guid, PlanetSideEmpire.NEUTRAL)) - val info = DeployableInfo(guid, DeployableIcon.Boomer, obj.Position, PlanetSideGUID(0)) + val info = DeployableInfo(guid, DeployableIcon.Boomer, obj.Position, types.PlanetSideGUID(0)) sendResponse(DeployableObjectsInfoMessage(DeploymentAction.Dismiss, info)) continent.LocalEvents ! LocalServiceMessage(factionChannel, LocalAction.DeployableMapIcon(playerGUID, DeploymentAction.Dismiss, info)) PutItemOnGround(item, pos, orient) @@ -829,7 +830,7 @@ class WorldSessionActor extends Actor //pointless trigger val guid = item.GUID continent.Ground ! Zone.Ground.RemoveItem(guid) //undo; no callback - continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(PlanetSideGUID(0), guid)) + continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(types.PlanetSideGUID(0), guid)) taskResolver ! GUIDTask.UnregisterObjectTask(item)(continent.GUID) } @@ -1030,7 +1031,7 @@ class WorldSessionActor extends Actor LivePlayerList.Add(sessionId, avatar) traveler = new Traveler(self, continent.Id) //PropertyOverrideMessage - sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 112, 0)) // disable festive backpacks + sendResponse(PlanetsideAttributeMessage(types.PlanetSideGUID(0), 112, 0)) // disable festive backpacks sendResponse(ReplicationStreamMessage(5, Some(6), Vector.empty)) //clear squad list sendResponse(FriendsResponse(FriendAction.InitializeFriendList, 0, true, true, Nil)) sendResponse(FriendsResponse(FriendAction.InitializeIgnoreList, 0, true, true, Nil)) @@ -1169,7 +1170,7 @@ class WorldSessionActor extends Actor */ def HandleAvatarServiceResponse(toChannel : String, guid : PlanetSideGUID, reply : AvatarResponse.Response) : Unit = { val tplayer_guid = if(player.HasGUID) player.GUID - else PlanetSideGUID(0) + else types.PlanetSideGUID(0) reply match { case AvatarResponse.SendResponse(msg) => sendResponse(msg) @@ -1430,7 +1431,7 @@ class WorldSessionActor extends Actor } case AvatarResponse.ProjectileExplodes(projectile_guid, projectile) => - sendResponse(ProjectileStateMessage(projectile_guid, projectile.Position, Vector3.Zero, projectile.Orientation, 0, true, PlanetSideGUID(0))) + sendResponse(ProjectileStateMessage(projectile_guid, projectile.Position, Vector3.Zero, projectile.Orientation, 0, true, types.PlanetSideGUID(0))) sendResponse(ObjectDeleteMessage(projectile_guid, 2)) case AvatarResponse.ProjectileAutoLockAwareness(mode) => @@ -1518,7 +1519,7 @@ class WorldSessionActor extends Actor */ def HandleLocalServiceResponse(toChannel : String, guid : PlanetSideGUID, reply : LocalResponse.Response) : Unit = { val tplayer_guid = if(player.HasGUID) player.GUID - else PlanetSideGUID(0) + else types.PlanetSideGUID(0) reply match { case LocalResponse.AlertDestroyDeployable(obj) => //the (former) owner (obj.OwnerName) should process this message @@ -1661,10 +1662,10 @@ class WorldSessionActor extends Actor } case LocalResponse.ProximityTerminalEffect(object_guid, true) => - sendResponse(ProximityTerminalUseMessage(PlanetSideGUID(0), object_guid, true)) + sendResponse(ProximityTerminalUseMessage(types.PlanetSideGUID(0), object_guid, true)) case LocalResponse.ProximityTerminalEffect(object_guid, false) => - sendResponse(ProximityTerminalUseMessage(PlanetSideGUID(0), object_guid, false)) + sendResponse(ProximityTerminalUseMessage(types.PlanetSideGUID(0), object_guid, false)) ForgetAllProximityTerminals(object_guid) case LocalResponse.RouterTelepadMessage(msg) => @@ -1707,7 +1708,7 @@ class WorldSessionActor extends Actor */ def HandleChatServiceResponse(toChannel : String, avatar_guid : PlanetSideGUID, avatar_name : String, cont : Zone, avatar_pos : Vector3, avatar_faction : PlanetSideEmpire.Value, target : Int, reply : ChatMsg) : Unit = { val tplayer_guid = if(player.HasGUID) player.GUID - else PlanetSideGUID(0) + else types.PlanetSideGUID(0) target match { case 0 => // for other(s) user(s) if (player.GUID != avatar_guid) { @@ -1731,7 +1732,7 @@ class WorldSessionActor extends Actor if(!player.silenced) { sendResponse(ChatMsg(ChatMessageType.UNK_71, reply.wideContents, reply.recipient, "@silence_on", reply.note)) player.silenced = true - context.system.scheduler.scheduleOnce(silence_time minutes, chatService, ChatServiceMessage("gm", ChatAction.GM(PlanetSideGUID(0), player.Name, ChatMsg(ChatMessageType.CMT_SILENCE, true, "", player.Name, None)))) + context.system.scheduler.scheduleOnce(silence_time minutes, chatService, ChatServiceMessage("gm", ChatAction.GM(types.PlanetSideGUID(0), player.Name, ChatMsg(ChatMessageType.CMT_SILENCE, true, "", player.Name, None)))) } else { sendResponse(ChatMsg(ChatMessageType.UNK_71, reply.wideContents, reply.recipient, "@silence_off", reply.note)) @@ -2232,7 +2233,7 @@ class WorldSessionActor extends Actor val existingBox = existingWeapon.AmmoSlots(index).Box existingBox.Capacity = savedWeapon.AmmoSlots(index).Box.Capacity //use VehicleAction.InventoryState2; VehicleAction.InventoryState temporarily glitches ammo count in ui - continent.VehicleEvents ! VehicleServiceMessage(channel, VehicleAction.InventoryState2(PlanetSideGUID(0), existingBox.GUID, existingWeapon.GUID, existingBox.Capacity)) + continent.VehicleEvents ! VehicleServiceMessage(channel, VehicleAction.InventoryState2(types.PlanetSideGUID(0), existingBox.GUID, existingWeapon.GUID, existingBox.Capacity)) }) }) afterInventory @@ -2447,7 +2448,7 @@ class WorldSessionActor extends Actor * @param reply na */ def HandleVehicleServiceResponse(toChannel : String, guid : PlanetSideGUID, reply : VehicleResponse.Response) : Unit = { - val tplayer_guid = if(player.HasGUID) player.GUID else PlanetSideGUID(0) + val tplayer_guid = if(player.HasGUID) player.GUID else types.PlanetSideGUID(0) reply match { case VehicleResponse.AttachToRails(vehicle_guid, pad_guid) => @@ -2703,7 +2704,7 @@ class WorldSessionActor extends Actor continent.Id, VehicleAction.SendResponse( player.GUID, - CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) + CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), types.PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) ) ) //sending packet to the cargo vehicle's client results in player locking himself in his vehicle @@ -2774,8 +2775,8 @@ class WorldSessionActor extends Actor cargo.MountedIn = carrierGUID hold.Occupant = cargo cargo.Velocity = None - continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 0, cargo.Health))) - continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 68, cargo.Shields))) + continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(types.PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 0, cargo.Health))) + continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(types.PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 68, cargo.Shields))) StartBundlingPackets() val (attachMsg, mountPointMsg) = CargoMountBehaviorForAll(carrier, cargo, mountPoint) StopBundlingPackets() @@ -2789,7 +2790,7 @@ class WorldSessionActor extends Actor continent.Id, VehicleAction.SendResponse( player.GUID, - CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) + CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), types.PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) ) ) //sending packet to the cargo vehicle's client results in player locking himself in his vehicle @@ -2842,7 +2843,7 @@ class WorldSessionActor extends Actor def CargoMountMessages(carrierGUID : PlanetSideGUID, cargoGUID : PlanetSideGUID, mountPoint : Int, orientation : Int) : (ObjectAttachMessage, CargoMountPointStatusMessage) = { ( ObjectAttachMessage(carrierGUID, cargoGUID, mountPoint), - CargoMountPointStatusMessage(carrierGUID, cargoGUID, cargoGUID, PlanetSideGUID(0), mountPoint, CargoStatus.Occupied, orientation) + CargoMountPointStatusMessage(carrierGUID, cargoGUID, cargoGUID, types.PlanetSideGUID(0), mountPoint, CargoStatus.Occupied, orientation) ) } @@ -3087,7 +3088,7 @@ class WorldSessionActor extends Actor val guid = tplayer.GUID StartBundlingPackets() InitializeDeployableUIElements(avatar) - sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 75, 0)) + sendResponse(PlanetsideAttributeMessage(types.PlanetSideGUID(0), 75, 0)) sendResponse(SetCurrentAvatarMessage(guid, 0, 0)) sendResponse(ChatMsg(ChatMessageType.CMT_EXPANSIONS, true, "", "1 on", None)) //CC on //TODO once per respawn? sendResponse(PlayerStateShiftMessage(ShiftState(1, shiftPosition.getOrElse(tplayer.Position), tplayer.Orientation.z))) @@ -3100,7 +3101,7 @@ class WorldSessionActor extends Actor sendResponse(AvatarImplantMessage(guid, ImplantAction.Activation, slot, 0)) //deactivate implant //TODO if this implant is Installed but does not have shortcut, add to a free slot or write over slot 61/62/63 }) - sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 82, 0)) + sendResponse(PlanetsideAttributeMessage(types.PlanetSideGUID(0), 82, 0)) //TODO if Medkit does not have shortcut, add to a free slot or write over slot 64 sendResponse(CreateShortcutMessage(guid, 1, 0, true, Shortcut.MEDKIT)) sendResponse(ChangeShortcutBankMessage(guid, 0)) @@ -3125,7 +3126,7 @@ class WorldSessionActor extends Actor sendResponse(AvatarSearchCriteriaMessage(guid, List(0, 0, 0, 0, 0, 0))) (1 to 73).foreach(i => { // not all GUID's are set, and not all of the set ones will always be zero; what does this section do? - sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(i), 67, 0)) + sendResponse(PlanetsideAttributeMessage(types.PlanetSideGUID(i), 67, 0)) }) (0 to 30).foreach(i => { //TODO 30 for a new character only? @@ -3184,16 +3185,16 @@ class WorldSessionActor extends Actor def FirstTimeSquadSetup() : Unit = { sendResponse(SquadDetailDefinitionUpdateMessage.Init) sendResponse(ReplicationStreamMessage(5, Some(6), Vector.empty)) //clear squad list - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.Unknown(6))) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.Unknown(6))) //only need to load these once - they persist between zone transfers and respawns avatar.SquadLoadouts.Loadouts.foreach { case (index, loadout : SquadLoadout) => - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), index, SquadAction.ListSquadFavorite(loadout.task))) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), index, SquadAction.ListSquadFavorite(loadout.task))) } //non-squad GUID-0 counts as the settings when not joined with a squad - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.AssociateWithSquad())) - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.SetListSquad())) - sendResponse(SquadDefinitionActionMessage(PlanetSideGUID(0), 0, SquadAction.Unknown(18))) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.AssociateWithSquad())) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.SetListSquad())) + sendResponse(SquadDefinitionActionMessage(types.PlanetSideGUID(0), 0, SquadAction.Unknown(18))) squadService ! SquadServiceMessage(player, continent, SquadServiceAction.InitSquadList()) squadService ! SquadServiceMessage(player, continent, SquadServiceAction.InitCharId()) squadSetup = RespawnSquadSetup @@ -3383,7 +3384,7 @@ class WorldSessionActor extends Actor case (Some(_ : Vehicle), Some(carrier : Vehicle)) => carrier.Definition.Cargo.headOption match { case Some((mountPoint, _)) => //begin the mount process - open the cargo door - val reply = CargoMountPointStatusMessage(cargo_vehicle_guid, PlanetSideGUID(0), vehicle_guid, PlanetSideGUID(0), mountPoint, CargoStatus.InProgress, 0) + val reply = CargoMountPointStatusMessage(cargo_vehicle_guid, types.PlanetSideGUID(0), vehicle_guid, types.PlanetSideGUID(0), mountPoint, CargoStatus.InProgress, 0) log.debug(reply.toString) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.SendResponse(player.GUID, reply)) sendResponse(reply) @@ -3449,7 +3450,7 @@ class WorldSessionActor extends Actor //custom sendResponse(ContinentalLockUpdateMessage(13, PlanetSideEmpire.VS)) // "The VS have captured the VS Sanctuary." sendResponse(ReplicationStreamMessage(5, Some(6), Vector.empty)) //clear squad list - sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 112, 0)) // disable festive backpacks + sendResponse(PlanetsideAttributeMessage(types.PlanetSideGUID(0), 112, 0)) // disable festive backpacks //(0 to 255).foreach(i => { sendResponse(SetEmpireMessage(PlanetSideGUID(i), PlanetSideEmpire.VS)) }) //find and reclaim own deployables, if any @@ -3511,7 +3512,7 @@ class WorldSessionActor extends Actor continent.DeployableList .filter(obj => obj.Faction == faction && obj.Health > 0) .foreach(obj => { - val deployInfo = DeployableInfo(obj.GUID, Deployable.Icon(obj.Definition.Item), obj.Position, obj.Owner.getOrElse(PlanetSideGUID(0))) + val deployInfo = DeployableInfo(obj.GUID, Deployable.Icon(obj.Definition.Item), obj.Position, obj.Owner.getOrElse(types.PlanetSideGUID(0))) sendResponse(DeployableObjectsInfoMessage(DeploymentAction.Build, deployInfo)) }) //render Equipment that was dropped into zone before the player arrived @@ -3625,14 +3626,14 @@ class WorldSessionActor extends Actor //implant terminals continent.Map.TerminalToInterface.foreach({ case ((terminal_guid, interface_guid)) => - val parent_guid = PlanetSideGUID(terminal_guid) + val parent_guid = types.PlanetSideGUID(terminal_guid) continent.GUID(interface_guid) match { case Some(obj : Terminal) => val objDef = obj.Definition sendResponse( ObjectCreateMessage( objDef.ObjectId, - PlanetSideGUID(interface_guid), + types.PlanetSideGUID(interface_guid), ObjectCreateMessageParent(parent_guid, 1), objDef.Packet.ConstructorData(obj).get ) @@ -4030,7 +4031,7 @@ class WorldSessionActor extends Actor case Some(turret : FacilityTurret) if turret.isUpgrading => FinishUpgradingMannedTurret(turret, TurretUpgrade.None) case _ => - self ! PacketCoding.CreateGamePacket(0, RequestDestroyMessage(PlanetSideGUID(guid))) + self ! PacketCoding.CreateGamePacket(0, RequestDestroyMessage(types.PlanetSideGUID(guid))) } } if(messagetype == ChatMessageType.CMT_VOICE) { @@ -4437,7 +4438,7 @@ class WorldSessionActor extends Actor log.warn(s"RequestDestroy: boomer_trigger@$guid has been found but it seems to be orphaned") case _ => ; } - continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(PlanetSideGUID(0), guid)) + continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(types.PlanetSideGUID(0), guid)) GUIDTask.UnregisterObjectTask(trigger)(continent.GUID) case None => ; @@ -4575,7 +4576,7 @@ class WorldSessionActor extends Actor if (avatar.Implant(slot).id == 3) timeDL = 0 if (avatar.Implant(slot).id == 9) timeSurge = 0 } - sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid),action,slot,status)) + sendResponse(AvatarImplantMessage(types.PlanetSideGUID(player.GUID.guid),action,slot,status)) } case msg @ UseItemMessage(avatar_guid, item_used_guid, object_guid, unk2, unk3, unk4, unk5, unk6, unk7, unk8, itemType) => @@ -5025,7 +5026,7 @@ class WorldSessionActor extends Actor //explicit request terminal.Actor ! Terminal.Request( player, - ItemTransactionMessage(object_guid, TransactionType.Buy, 0, "router_telepad", 0, PlanetSideGUID(0)) + ItemTransactionMessage(object_guid, TransactionType.Buy, 0, "router_telepad", 0, types.PlanetSideGUID(0)) ) } else if (!ownerIsHacked || (ownerIsHacked && terminal.HackedBy.isDefined)) { @@ -5044,7 +5045,7 @@ class WorldSessionActor extends Actor } } case Some(obj : SpawnTube) => - if(item_used_guid == PlanetSideGUID(0)) { // Ensure that we're not trying to use a tool on the spawn tube, e.g. medical applicator + if(item_used_guid == types.PlanetSideGUID(0)) { // Ensure that we're not trying to use a tool on the spawn tube, e.g. medical applicator //deconstruction PlayerActionsToCancel() CancelAllProximityUnits() @@ -6265,7 +6266,7 @@ class WorldSessionActor extends Actor tplayer.Holsters().foreach(holster => { SetCharacterSelectScreenGUID_SelectEquipment(holster.Equipment, gen) }) - tplayer.GUID = PlanetSideGUID(gen.getAndIncrement) + tplayer.GUID = types.PlanetSideGUID(gen.getAndIncrement) } /** @@ -6278,10 +6279,10 @@ class WorldSessionActor extends Actor private def SetCharacterSelectScreenGUID_SelectEquipment(item : Option[Equipment], gen : AtomicInteger) : Unit = { item match { case Some(tool : Tool) => - tool.AmmoSlots.foreach(slot => { slot.Box.GUID = PlanetSideGUID(gen.getAndIncrement) }) - tool.GUID = PlanetSideGUID(gen.getAndIncrement) + tool.AmmoSlots.foreach(slot => { slot.Box.GUID = types.PlanetSideGUID(gen.getAndIncrement) }) + tool.GUID = types.PlanetSideGUID(gen.getAndIncrement) case Some(item : Equipment) => - item.GUID = PlanetSideGUID(gen.getAndIncrement) + item.GUID = types.PlanetSideGUID(gen.getAndIncrement) case None => ; } } @@ -6563,7 +6564,7 @@ class WorldSessionActor extends Actor if(vehicle.Owner.contains(pguid)) { vehicle.AssignOwnership(None) val factionChannel = s"${vehicle.Faction}" - continent.VehicleEvents ! VehicleServiceMessage(factionChannel, VehicleAction.Ownership(pguid, PlanetSideGUID(0))) + continent.VehicleEvents ! VehicleServiceMessage(factionChannel, VehicleAction.Ownership(pguid, types.PlanetSideGUID(0))) val vguid = vehicle.GUID val empire = VehicleLockState.Empire.id (0 to 2).foreach(group => { @@ -7437,7 +7438,7 @@ class WorldSessionActor extends Actor } case DriveState.Deployed => //let the timer do all the work - continent.LocalEvents ! LocalServiceMessage(continent.Id, LocalAction.ToggleTeleportSystem(PlanetSideGUID(0), vehicle, TelepadLike.AppraiseTeleportationSystem(vehicle, continent))) + continent.LocalEvents ! LocalServiceMessage(continent.Id, LocalAction.ToggleTeleportSystem(types.PlanetSideGUID(0), vehicle, TelepadLike.AppraiseTeleportationSystem(vehicle, continent))) case DriveState.Undeploying => //deactivate internal router before trying to reset the system vehicle.Utility(UtilityType.internal_router_telepad_deployable) match { @@ -7450,7 +7451,7 @@ class WorldSessionActor extends Actor case Some(_) | None => ; } util.Active = false - continent.LocalEvents ! LocalServiceMessage(continent.Id, LocalAction.ToggleTeleportSystem(PlanetSideGUID(0), vehicle, None)) + continent.LocalEvents ! LocalServiceMessage(continent.Id, LocalAction.ToggleTeleportSystem(types.PlanetSideGUID(0), vehicle, None)) case _ => log.warn(s"DeploymentActivities: could not find internal telepad in router@${vehicle.GUID.guid} while $state") } @@ -7632,10 +7633,10 @@ class WorldSessionActor extends Actor if(hackable.HackedBy.isDefined) { amenity.Definition match { case GlobalDefinitions.capture_terminal => - self ! LocalServiceResponse("", PlanetSideGUID(0), LocalResponse.HackCaptureTerminal(amenity.GUID, 0L, 0L, false)) + self ! LocalServiceResponse("", types.PlanetSideGUID(0), LocalResponse.HackCaptureTerminal(amenity.GUID, 0L, 0L, false)) case _ => // Generic hackable object - self ! LocalServiceResponse("", PlanetSideGUID(0), LocalResponse.HackObject(amenity.GUID, 1114636288L, 8L)) + self ! LocalServiceResponse("", types.PlanetSideGUID(0), LocalResponse.HackObject(amenity.GUID, 1114636288L, 8L)) } } } @@ -7682,7 +7683,7 @@ class WorldSessionActor extends Actor sendResponse(PlanetsideAttributeMessage(player_guid, 0, 0)) sendResponse(PlanetsideAttributeMessage(player_guid, 2, 0)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player_guid, 0, 0)) - sendResponse(DestroyMessage(player_guid, player_guid, PlanetSideGUID(0), pos)) //how many players get this message? + sendResponse(DestroyMessage(player_guid, player_guid, types.PlanetSideGUID(0), pos)) //how many players get this message? sendResponse(AvatarDeadStateMessage(DeadState.Dead, respawnTimer, respawnTimer, pos, player.Faction, true)) if(tplayer.VehicleSeated.nonEmpty) { continent.GUID(tplayer.VehicleSeated.get) match { @@ -8562,7 +8563,7 @@ class WorldSessionActor extends Actor * second pair is maximum quantity */ def UpdateDeployableUIElements(list : List[(Int,Int,Int,Int)]) : Unit = { - val guid = PlanetSideGUID(0) + val guid = types.PlanetSideGUID(0) list.foreach({ case((currElem, curr, maxElem, max)) => //fields must update in ordered pairs: max, curr sendResponse(PlanetsideAttributeMessage(guid, maxElem, max)) @@ -8763,7 +8764,7 @@ class WorldSessionActor extends Actor sendResponse(ObjectCreateMessage(definition.ObjectId, guid, definition.Packet.ConstructorData(obj).get)) continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.DeployItem(player.GUID, obj)) //map icon - val deployInfo = DeployableInfo(guid, Deployable.Icon(item), obj.Position, obj.Owner.getOrElse(PlanetSideGUID(0))) + val deployInfo = DeployableInfo(guid, Deployable.Icon(item), obj.Position, obj.Owner.getOrElse(types.PlanetSideGUID(0))) sendResponse(DeployableObjectsInfoMessage(DeploymentAction.Build, deployInfo)) continent.LocalEvents ! LocalServiceMessage(s"${player.Faction}", LocalAction.DeployableMapIcon(player.GUID, DeploymentAction.Build, deployInfo)) } @@ -8937,7 +8938,7 @@ class WorldSessionActor extends Actor obj.Position = Vector3.Zero continent.Ground ! Zone.Ground.RemoveItem(object_guid) continent.AvatarEvents ! AvatarServiceMessage.Ground(RemoverActor.ClearSpecific(List(obj), continent)) - continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(PlanetSideGUID(0), object_guid)) + continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(types.PlanetSideGUID(0), object_guid)) log.info(s"RequestDestroy: equipment $obj on ground") true } @@ -8962,7 +8963,7 @@ class WorldSessionActor extends Actor sendResponse( DeployableObjectsInfoMessage( DeploymentAction.Dismiss, - DeployableInfo(guid, Deployable.Icon(obj.Definition.Item), pos, obj.Owner.getOrElse(PlanetSideGUID(0))) + DeployableInfo(guid, Deployable.Icon(obj.Definition.Item), pos, obj.Owner.getOrElse(types.PlanetSideGUID(0))) ) ) } @@ -8987,7 +8988,7 @@ class WorldSessionActor extends Actor sendResponse( DeployableObjectsInfoMessage( DeploymentAction.Dismiss, - DeployableInfo(guid, Deployable.Icon(obj.Definition.Item), pos, obj.Owner.getOrElse(PlanetSideGUID(0))) + DeployableInfo(guid, Deployable.Icon(obj.Definition.Item), pos, obj.Owner.getOrElse(types.PlanetSideGUID(0))) ) ) } @@ -9020,13 +9021,13 @@ class WorldSessionActor extends Actor target.OwnerName match { case Some(owner) => target.OwnerName = None - continent.LocalEvents ! LocalServiceMessage(owner, LocalAction.AlertDestroyDeployable(PlanetSideGUID(0), target)) + continent.LocalEvents ! LocalServiceMessage(owner, LocalAction.AlertDestroyDeployable(types.PlanetSideGUID(0), target)) case None => ; } continent.LocalEvents ! LocalServiceMessage(s"${target.Faction}", LocalAction.DeployableMapIcon( - PlanetSideGUID(0), + types.PlanetSideGUID(0), DeploymentAction.Dismiss, - DeployableInfo(target.GUID, Deployable.Icon(target.Definition.Item), target.Position, PlanetSideGUID(0))) + DeployableInfo(target.GUID, Deployable.Icon(target.Definition.Item), target.Position, types.PlanetSideGUID(0))) ) continent.LocalEvents ! LocalServiceMessage.Deployables(RemoverActor.ClearSpecific(List(target), continent)) continent.LocalEvents ! LocalServiceMessage.Deployables(RemoverActor.AddTask(target, continent, time)) @@ -9289,7 +9290,7 @@ class WorldSessionActor extends Actor player.Continent = zone_id //forward-set the continent id to perform a test interstellarFerryTopLevelGUID = (if(vehicle.Seats.values.count(_.isOccupied) == 1 && occupiedCargoHolds.size == 0) { //do not delete if vehicle has passengers or cargo - val vehicleToDelete = interstellarFerryTopLevelGUID.orElse(player.VehicleSeated).getOrElse(PlanetSideGUID(0)) + val vehicleToDelete = interstellarFerryTopLevelGUID.orElse(player.VehicleSeated).getOrElse(types.PlanetSideGUID(0)) continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.UnloadVehicle(pguid, continent, vehicle, vehicleToDelete)) None } @@ -9351,7 +9352,7 @@ class WorldSessionActor extends Actor val continentId = continent.Id if(NoVehicleOccupantsInZone(vehicle, continentId)) { //do not dispatch delete action if any hierarchical occupant has not gotten this far through the summoning process - val vehicleToDelete = interstellarFerryTopLevelGUID.orElse(player.VehicleSeated).getOrElse(PlanetSideGUID(0)) + val vehicleToDelete = interstellarFerryTopLevelGUID.orElse(player.VehicleSeated).getOrElse(types.PlanetSideGUID(0)) continent.VehicleEvents ! VehicleServiceMessage(continentId, VehicleAction.UnloadVehicle(player.GUID, continent, vehicle, vehicleToDelete)) } interstellarFerryTopLevelGUID = None @@ -9459,7 +9460,7 @@ class WorldSessionActor extends Actor sendResponse(ActionResultMessage.Pass) player.GUID //we're dropping the item; don't need to see it dropped again case None => - PlanetSideGUID(0) //item is being introduced into the world upon drop + types.PlanetSideGUID(0) //item is being introduced into the world upon drop } continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.DropItem(exclusionId, item, continent)) } @@ -9716,18 +9717,18 @@ class WorldSessionActor extends Actor carrier.Position } StartBundlingPackets() - continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 0, cargo.Health))) - continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 68, cargo.Shields))) + continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(types.PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 0, cargo.Health))) + continent.VehicleEvents ! VehicleServiceMessage(s"${cargo.Actor}", VehicleAction.SendResponse(types.PlanetSideGUID(0), PlanetsideAttributeMessage(cargoGUID, 68, cargo.Shields))) if(carrier.Flying) { //the carrier vehicle is flying; eject the cargo vehicle - val ejectCargoMsg = CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.InProgress, 0) + val ejectCargoMsg = CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), types.PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.InProgress, 0) val detachCargoMsg = ObjectDetachMessage(carrierGUID, cargoGUID, cargoHoldPosition - Vector3.z(1), rotation) - val resetCargoMsg = CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) + val resetCargoMsg = CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), types.PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) sendResponse(ejectCargoMsg) //dismount vehicle on UI and disable "shield" effect on lodestar sendResponse(detachCargoMsg) continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(player_guid, ejectCargoMsg)) continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(player_guid, detachCargoMsg)) - continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(PlanetSideGUID(0), resetCargoMsg)) //lazy + continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(types.PlanetSideGUID(0), resetCargoMsg)) //lazy log.debug(ejectCargoMsg.toString) log.debug(detachCargoMsg.toString) if(driverOpt.isEmpty) { @@ -9738,7 +9739,7 @@ class WorldSessionActor extends Actor } else { //the carrier vehicle is not flying; just open the door and let the cargo vehicle back out; force it out if necessary - val cargoStatusMessage = CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), cargoGUID, PlanetSideGUID(0), mountPoint, CargoStatus.InProgress, 0) + val cargoStatusMessage = CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), cargoGUID, types.PlanetSideGUID(0), mountPoint, CargoStatus.InProgress, 0) val cargoDetachMessage = ObjectDetachMessage(carrierGUID, cargoGUID, cargoHoldPosition + Vector3.z(1f), rotation) sendResponse(cargoStatusMessage) sendResponse(cargoDetachMessage) @@ -9754,8 +9755,8 @@ class WorldSessionActor extends Actor cargoDismountTimer.cancel cargoDismountTimer = context.system.scheduler.scheduleOnce(250 milliseconds, self, CheckCargoDismount(cargoGUID, carrierGUID, mountPoint, iteration = 0)) case None => - val resetCargoMsg = CargoMountPointStatusMessage(carrierGUID, PlanetSideGUID(0), PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) - continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(PlanetSideGUID(0), resetCargoMsg)) //lazy + val resetCargoMsg = CargoMountPointStatusMessage(carrierGUID, types.PlanetSideGUID(0), types.PlanetSideGUID(0), cargoGUID, mountPoint, CargoStatus.Empty, 0) + continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.SendResponse(types.PlanetSideGUID(0), resetCargoMsg)) //lazy //TODO cargo should back out like normal; until then, deconstruct it continent.VehicleEvents ! VehicleServiceMessage.Decon(RemoverActor.ClearSpecific(List(cargo), continent)) continent.VehicleEvents ! VehicleServiceMessage.Decon(RemoverActor.AddTask(cargo, continent, Some(0 seconds))) @@ -9915,7 +9916,7 @@ class WorldSessionActor extends Actor sendResponse(SquadMemberEvent.Add(id, fromCharId, fromIndex, toElem.name, toElem.zone, unk7 = 0)) sendResponse( SquadState( - PlanetSideGUID(id), + types.PlanetSideGUID(id), List( SquadStateInfo(fromCharId, toElem.health, toElem.armor, toElem.position, 2, 2, false, 429, None, None), SquadStateInfo(toCharId, fromElem.health, fromElem.armor, fromElem.position, 2, 2, false, 429, None, None) @@ -9931,7 +9932,7 @@ class WorldSessionActor extends Actor sendResponse(SquadMemberEvent.Add(id, fromCharId, toIndex, elem.name, elem.zone, unk7 = 0)) sendResponse( SquadState( - PlanetSideGUID(id), + types.PlanetSideGUID(id), List(SquadStateInfo(fromCharId, elem.health, elem.armor, elem.position, 2, 2, false, 429, None, None)) ) ) @@ -10119,7 +10120,7 @@ class WorldSessionActor extends Actor if(avatar.Implants(0).Active) { avatar.Implants(0).Active = false continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(0).id * 2)) - sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 0, 0)) + sendResponse(AvatarImplantMessage(types.PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 0, 0)) timeDL = 0 } } @@ -10132,7 +10133,7 @@ class WorldSessionActor extends Actor if(avatar.Implants(1).Active) { avatar.Implants(1).Active = false continent.AvatarEvents ! AvatarServiceMessage(continent.Id, AvatarAction.PlanetsideAttribute(player.GUID, 28, avatar.Implant(1).id * 2)) - sendResponse(AvatarImplantMessage(PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 1, 0)) + sendResponse(AvatarImplantMessage(types.PlanetSideGUID(player.GUID.guid), ImplantAction.Activation, 1, 0)) timeSurge = 0 } } diff --git a/pslogin/src/test/scala/PacketCodingActorTest.scala b/pslogin/src/test/scala/PacketCodingActorTest.scala index 71b69b5d..bd430070 100644 --- a/pslogin/src/test/scala/PacketCodingActorTest.scala +++ b/pslogin/src/test/scala/PacketCodingActorTest.scala @@ -6,6 +6,7 @@ import net.psforever.packet.control.{ControlSync, MultiPacketBundle, SlottedMeta import net.psforever.packet.{ControlPacket, GamePacket, GamePacketOpcode, PacketCoding} import net.psforever.packet.game._ import net.psforever.packet.game.objectcreate.ObjectClass +import net.psforever.types import net.psforever.types._ import scodec.bits._ @@ -51,7 +52,7 @@ class PacketCodingActor3Test extends ActorTest { class PacketCodingActor4Test extends ActorTest { val string_hex = RawPacket(hex"2A 9F05 D405 86") - val string_obj = ObjectAttachMessage(PlanetSideGUID(1439), PlanetSideGUID(1492), 6) + val string_obj = ObjectAttachMessage(types.PlanetSideGUID(1439), types.PlanetSideGUID(1492), 6) "PacketCodingActor" should { "translate r-originating game packet into l-facing hexadecimal data" in { @@ -72,7 +73,7 @@ class PacketCodingActor4Test extends ActorTest { class PacketCodingActor5Test extends ActorTest { val string_hex = RawPacket(hex"2A 9F05 D405 86") - val string_obj = ObjectAttachMessage(PlanetSideGUID(1439), PlanetSideGUID(1492), 6) + val string_obj = ObjectAttachMessage(types.PlanetSideGUID(1439), types.PlanetSideGUID(1492), 6) "PacketCodingActor" should { "translate l-originating hexadecimal data into r-facing game packet" in { @@ -95,7 +96,7 @@ class PacketCodingActor5Test extends ActorTest { } class PacketCodingActor6Test extends ActorTest { - val string_obj = ObjectAttachMessage(PlanetSideGUID(1439), PlanetSideGUID(1492), 6) + val string_obj = ObjectAttachMessage(types.PlanetSideGUID(1439), types.PlanetSideGUID(1492), 6) "PacketCodingActor" should { "permit l-originating game packet to pass through as an r-facing game packet" in { @@ -369,8 +370,8 @@ class PacketCodingActorETest extends ActorTest { "PacketCodingActor" should { "unwind l-originating hexadecimal data into multiple r-facing packets (MultiPacket -> 2 PlayerStateMessageUpstream)" in { val string_hex = RawPacket(hex"00 03 18 BD E8 04 5C 02 60 E3 F9 19 0E C1 41 27 00 04 02 60 20 0C 58 0B 20 00 00 18 BD E8 04 86 02 62 13 F9 19 0E D8 40 4D 00 04 02 60 20 0C 78 0A 80 00 00") - val string_obj1 = GamePacket(GamePacketOpcode.PlayerStateMessageUpstream, 0, PlayerStateMessageUpstream(PlanetSideGUID(1256),Vector3(3076.7188f,4734.1094f,56.390625f),Some(Vector3(4.0625f,4.59375f,0.0f)),36.5625f,-2.8125f,0.0f,866,0,false,false,false,false,178,0)) - val string_obj2 = GamePacket(GamePacketOpcode.PlayerStateMessageUpstream, 0, PlayerStateMessageUpstream(PlanetSideGUID(1256),Vector3(3077.0469f,4734.258f,56.390625f),Some(Vector3(5.5f,1.1875f,0.0f)),36.5625f,-2.8125f,0.0f,867,0,false,false,false,false,168,0)) + val string_obj1 = GamePacket(GamePacketOpcode.PlayerStateMessageUpstream, 0, PlayerStateMessageUpstream(types.PlanetSideGUID(1256),Vector3(3076.7188f,4734.1094f,56.390625f),Some(Vector3(4.0625f,4.59375f,0.0f)),36.5625f,-2.8125f,0.0f,866,0,false,false,false,false,178,0)) + val string_obj2 = GamePacket(GamePacketOpcode.PlayerStateMessageUpstream, 0, PlayerStateMessageUpstream(types.PlanetSideGUID(1256),Vector3(3077.0469f,4734.258f,56.390625f),Some(Vector3(5.5f,1.1875f,0.0f)),36.5625f,-2.8125f,0.0f,867,0,false,false,false,false,168,0)) val probe1 = TestProbe() val probe2 = system.actorOf(Props(classOf[MDCTestProbe], probe1), "mdc-probe") @@ -391,7 +392,7 @@ class PacketCodingActorFTest extends ActorTest { "PacketCodingActor" should { "unwind l-originating hexadecimal data into an r-facing packet (MultiPacket -> RelatedB + GenericObjectStateMsg)" in { val string_hex = RawPacket(hex"00 03 04 00 15 02 98 0B 00 09 0C 0A 1D F2 00 10 00 00 00") - val string_obj = GamePacket(GamePacketOpcode.GenericObjectStateMsg, 0, GenericObjectStateMsg(PlanetSideGUID(242), 16)) + val string_obj = GamePacket(GamePacketOpcode.GenericObjectStateMsg, 0, GenericObjectStateMsg(types.PlanetSideGUID(242), 16)) val probe1 = TestProbe() val probe2 = system.actorOf(Props(classOf[MDCTestProbe], probe1), "mdc-probe") @@ -412,7 +413,7 @@ class PacketCodingActorGTest extends ActorTest { "PacketCodingActor" should { "unwind l-originating hexadecimal data into an r-facing packet (MultiPacketEx -> RelatedA + GenericObjectStateMsg)" in { val string_hex = RawPacket(hex"00 19 04 00 11 02 98 0B 00 09 0C 0A 1D F2 00 10 00 00 00") - val string_obj = GamePacket(GamePacketOpcode.GenericObjectStateMsg, 0, GenericObjectStateMsg(PlanetSideGUID(242), 16)) + val string_obj = GamePacket(GamePacketOpcode.GenericObjectStateMsg, 0, GenericObjectStateMsg(types.PlanetSideGUID(242), 16)) val probe1 = TestProbe() val probe2 = system.actorOf(Props(classOf[MDCTestProbe], probe1), "mdc-probe") @@ -433,8 +434,8 @@ class PacketCodingActorHTest extends ActorTest { "PacketCodingActor" should { "unwind l-originating hexadecimal data into two r-facing packets (SlottedMetaPacket/MultiPacketEx -> 2 ObjectDeleteMessage)" in { val string_hex = RawPacket(hex"00 09 0A E1 00 19 04 19 4F 04 40 04 19 51 04 40") - val string_obj1 = GamePacket(GamePacketOpcode.ObjectDeleteMessage, 0, ObjectDeleteMessage(PlanetSideGUID(1103), 2)) - val string_obj2 = GamePacket(GamePacketOpcode.ObjectDeleteMessage, 0, ObjectDeleteMessage(PlanetSideGUID(1105), 2)) + val string_obj1 = GamePacket(GamePacketOpcode.ObjectDeleteMessage, 0, ObjectDeleteMessage(types.PlanetSideGUID(1103), 2)) + val string_obj2 = GamePacket(GamePacketOpcode.ObjectDeleteMessage, 0, ObjectDeleteMessage(types.PlanetSideGUID(1105), 2)) val probe1 = TestProbe() val probe2 = system.actorOf(Props(classOf[MDCTestProbe], probe1), "mdc-probe") @@ -485,7 +486,7 @@ class PacketCodingActorITest extends ActorTest { ) val obj = DetailedPlayerData(pos, app, char, InventoryData(Nil), DrawnSlot.None) //println(s"${PacketCoding.EncodePacket(ObjectCreateDetailedMessage(0x79, PlanetSideGUID(75), obj))}") - val pkt = MultiPacketBundle(List(ObjectCreateDetailedMessage(0x79, PlanetSideGUID(75), obj))) + val pkt = MultiPacketBundle(List(ObjectCreateDetailedMessage(0x79, types.PlanetSideGUID(75), obj))) val string_hex = hex"00090000186c060000bc84b000000000000000000002040000097049006c006c006c004900490049006c006c006c0049006c0049006c006c0049006c006c006c0049006c006c00490084524000000000000000000000000000000020000007f00703fffffffffffffffffffffffffffffffc000000000000000000000000000000000000000190019000640000000000c800c80000000000000000000000000000000000000001c00042c54686c7000000000000000000000000000000000000000000000000000000000000100000000400e0" "PacketCodingActor" should { @@ -520,7 +521,7 @@ class PacketCodingActorJTest extends ActorTest { "PacketCodingActor" should { "bundle r-originating packets into a number of MTU-acceptable l-facing byte streams (1 packets into 1)" in { val pkt = MultiPacketBundle( - List(ObjectDeleteMessage(PlanetSideGUID(1103), 2), ObjectDeleteMessage(PlanetSideGUID(1105), 2), ObjectDeleteMessage(PlanetSideGUID(1107), 2)) + List(ObjectDeleteMessage(types.PlanetSideGUID(1103), 2), ObjectDeleteMessage(types.PlanetSideGUID(1105), 2), ObjectDeleteMessage(types.PlanetSideGUID(1107), 2)) ) val string_hex = hex"00090000001904194f044004195104400419530440" @@ -564,7 +565,7 @@ class PacketCodingActorKTest extends ActorTest { false, None, None, - PlanetSideGUID(0) + types.PlanetSideGUID(0) ), ExoSuitType.Standard, 0, @@ -640,12 +641,12 @@ class PacketCodingActorKTest extends ActorTest { (pad_length : Option[Int]) => DetailedCharacterData(ba, bb(ba.bep, pad_length))(pad_length) val obj = DetailedPlayerData(pos, app, char, InventoryData(Nil), DrawnSlot.None) val list = List( - ObjectCreateDetailedMessage(0x79, PlanetSideGUID(75), obj), - ObjectDeleteMessage(PlanetSideGUID(1103), 2), - ObjectDeleteMessage(PlanetSideGUID(1105), 2), - ObjectCreateDetailedMessage(0x79, PlanetSideGUID(175), obj), - ObjectCreateDetailedMessage(0x79, PlanetSideGUID(275), obj), - ObjectDeleteMessage(PlanetSideGUID(1107), 2) + ObjectCreateDetailedMessage(0x79, types.PlanetSideGUID(75), obj), + ObjectDeleteMessage(types.PlanetSideGUID(1103), 2), + ObjectDeleteMessage(types.PlanetSideGUID(1105), 2), + ObjectCreateDetailedMessage(0x79, types.PlanetSideGUID(175), obj), + ObjectCreateDetailedMessage(0x79, types.PlanetSideGUID(275), obj), + ObjectDeleteMessage(types.PlanetSideGUID(1107), 2) ) "PacketCodingActor" should { diff --git a/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala b/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala index 43f8f812..608cae8c 100644 --- a/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala +++ b/pslogin/src/test/scala/actor/objects/VehicleSpawnPadTest.scala @@ -8,8 +8,7 @@ import net.psforever.objects.serverobject.pad.{VehicleSpawnControl, VehicleSpawn import net.psforever.objects.serverobject.structures.StructureType import net.psforever.objects.{Avatar, GlobalDefinitions, Player, Vehicle} import net.psforever.objects.zones.Zone -import net.psforever.packet.game.PlanetSideGUID -import net.psforever.types._ +import net.psforever.types.{PlanetSideGUID, _} import services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._ diff --git a/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala b/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala index 7c6a60ca..b381f625 100644 --- a/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala +++ b/pslogin/src/test/scala/actor/service/AvatarServiceTest.scala @@ -9,7 +9,7 @@ import net.psforever.objects.ballistics.ResolvedProjectile import net.psforever.objects.guid.{GUIDTask, TaskResolver} import net.psforever.objects.zones.{Zone, ZoneActor, ZoneMap} import net.psforever.packet.game.objectcreate.{DroppedItemData, ObjectClass, ObjectCreateMessageParent, PlacementData} -import net.psforever.packet.game.{ObjectCreateMessage, PlanetSideGUID, PlayerStateMessageUpstream} +import net.psforever.packet.game.{ObjectCreateMessage, PlayerStateMessageUpstream} import net.psforever.types._ import services.{RemoverActor, Service, ServiceManager} import services.avatar._