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

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)

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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"

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

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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

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

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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

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

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

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

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

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

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

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

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

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