moved PlanetSideGUID from .packet.game to .types; project threw a hissy fit

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}
 

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.{PlanetSideGUID, Vector3}
-import net.psforever.types.Vector3
 import services.avatar.{AvatarAction, AvatarServiceMessage}
 import services.local.{LocalAction, LocalServiceMessage}
 

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

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}

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}

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}

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.{PlanetSideGUID, Vector3}
-import net.psforever.types.Vector3
 
 import scala.collection.mutable
 

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}

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, PlanetSideGUID}
-import net.psforever.types.PlanetSideEmpire
 
 import scala.annotation.tailrec
 

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, PlanetSideGUID}
-import net.psforever.types.CertificationType
 
 import scala.collection.mutable
 

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

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}
 

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}
 

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}

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}
 

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}

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}
 

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}

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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}
 

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).

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.<br>

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

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}
 

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)
       }
     }

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
 

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

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.

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.packet.game.TriggeredSound
-import net.psforever.types.{PlanetSideEmpire, Vector3}
+import net.psforever.types.{PlanetSideEmpire, PlanetSideGUID, Vector3}
 
 trait Hackable extends FactionAffinity {
   import Hackable._

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.<br>

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.{PlanetSideGUID, Vector3}
-import net.psforever.types.Vector3
 import services.vehicle.{VehicleAction, VehicleServiceMessage}
 
 import scala.concurrent.ExecutionContext.Implicits.global

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}

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}

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
   }

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, PlanetSideGUID}
-import net.psforever.types.{CertificationType, PlanetSideEmpire}
 
 class Squad(squadId : PlanetSideGUID, alignment : PlanetSideEmpire.Value) extends IdentifiableEntity {
   super.GUID_=(squadId)

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.packet.game.ItemTransactionMessage
-import net.psforever.types.Vector3
+import net.psforever.types.{PlanetSideGUID, Vector3}
 
 /**
   * An `Enumeration` of the available vehicular utilities.<br>

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, PlanetSideGUID, Vector3}
-import net.psforever.types.{DriveState, ExoSuitType, Vector3}
 import services.{RemoverActor, Service}
 import services.avatar.{AvatarAction, AvatarServiceMessage}
 import services.local.{LocalAction, LocalServiceMessage}

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, PlanetSideGUID, Vector3}
-import net.psforever.types.{PlanetSideEmpire, Vector3}
 import services.avatar.AvatarService
 import services.local.LocalService
 import services.vehicle.VehicleService

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

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._
 

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._
 

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._
 

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._
 

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._
 

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}

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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]
-}
+}

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}

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._
 

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._
 

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}

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._
 

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._
 

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}

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._
 

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._
 

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._
 

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._
 

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._
 

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.

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._

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._
 

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._
 

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._
 

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}

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._
 

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._
 

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._
 

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._

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._
 

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._