PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-03 04:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
FateJH 2020-01-06 08:45:55 -05:00 • committed by pschord
parent f9414a6798
commit 03bc52f52d
340 changed files with 481 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/src/test/scala/objects/BuildingTest.scala
View file

@ -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

2
common/src/test/scala/objects/ContainerTest.scala
View file

@ -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

3
common/src/test/scala/objects/ConverterTest.scala
View file

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

3
common/src/test/scala/objects/DeployableTest.scala
View file

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

2
common/src/test/scala/objects/DeployableToolboxTest.scala
View file

@ -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 {

4
common/src/test/scala/objects/DoorTest.scala
View file

@ -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

3
common/src/test/scala/objects/EntityTest.scala
View file

@ -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 {

3
common/src/test/scala/objects/EquipmentTest.scala
View file

@ -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 {

3
common/src/test/scala/objects/FacilityTurretTest.scala
View file

@ -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

3
common/src/test/scala/objects/IFFLockTest.scala
View file

@ -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 {

2
common/src/test/scala/objects/InventoryTest.scala
View file

@ -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

3
common/src/test/scala/objects/MountableTest.scala
View file

@ -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

3
common/src/test/scala/objects/PlayerTest.scala
View file

@ -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

3
common/src/test/scala/objects/ProjectileTest.scala
View file

@ -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 {

5
common/src/test/scala/objects/ResourceSiloTest.scala
View file

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

3
common/src/test/scala/objects/ServerObjectBuilderTest.scala
View file

@ -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

2
common/src/test/scala/objects/UtilityTest.scala
View file

@ -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

3
common/src/test/scala/objects/VehicleTest.scala
View file

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

3
common/src/test/scala/objects/ZoneTest.scala
View file

@ -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

2
common/src/test/scala/objects/number/NumberPoolHubTest.scala
View file

@ -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

2
common/src/test/scala/objects/number/NumberSourceTest.scala
View file

@ -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 {

6
common/src/test/scala/objects/number/UniqueNumberSystemTest.scala
View file

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

3
common/src/test/scala/objects/terminal/ImplantTerminalMechTest.scala
View file

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

2
common/src/test/scala/objects/terminal/MatrixTerminalTest.scala
View file

@ -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

2
common/src/test/scala/objects/terminal/OrderTerminalTest.scala
View file

@ -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

3
common/src/test/scala/objects/terminal/ProximityTest.scala
View file

@ -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

2
common/src/test/scala/objects/terminal/TerminalControlTest.scala
View file

@ -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